kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Don’t show rateapp dialog when routing session is active.

Browse source 
HotelsFilterDialog lint warning fix.
This commit is contained in:
Roman Romanov 2017-03-15 15:41:50 +04:00 • committed by Sergey Yershov
parent ece2a807af
commit ba76f46ce7
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/src/com/mapswithme/maps/ads/LikesManager.java
View file

@ -7,6 +7,7 @@ import android.util.SparseArray;
import java.lang.ref.WeakReference;
import com.mapswithme.maps.BuildConfig;
import com.mapswithme.maps.routing.RoutingController;
import com.mapswithme.util.Config;
import com.mapswithme.util.ConnectionState;
import com.mapswithme.util.concurrency.UiThread;
@ -107,7 +108,7 @@ public enum LikesManager
public void run()
{
final FragmentActivity activity = mActivityRef.get();
if (activity == null)
if (activity == null || RoutingController.get().isNavigating())
return;
final DialogFragment fragment;

5
android/src/com/mapswithme/maps/search/HotelsFilterView.java
View file

@ -5,6 +5,7 @@ import android.content.Context;
import android.content.res.Resources;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.CallSuper;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.AttributeSet;
@ -25,7 +26,7 @@ public class HotelsFilterView extends FrameLayout
{
private static final String STATE_OPENED = "state_opened";
public interface HotelsFilterListener
interface HotelsFilterListener
{
void onCancel();
@ -80,9 +81,11 @@ public class HotelsFilterView extends FrameLayout
LayoutInflater.from(context).inflate(R.layout.hotels_filter, this, true);
}
@CallSuper
@Override
protected void onFinishInflate()
{
super.onFinishInflate();
mFrame = findViewById(R.id.frame);
mFrame.setTranslationY(mFrame.getResources().getDisplayMetrics().heightPixels);
mFade = findViewById(R.id.fade);