Merge pull request #1070 from yunikkk/zoom-buttons-fixandroid-release-53

[android] Fixed zoom buttons bug after fullscreen mode toggle.

1 files changed, 18 insertions, 7 deletions

diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 74539a2e01..f27ef7e8ab 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -665,7 +665,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (!location.getProvider().equals(LocationHelper.LOCATION_PREDICTOR_PROVIDER))
       mLocationPredictor.reset(location);
 
-    mMapFragment.nativeLocationUpdated(location.getTime(),
+    MapFragment.nativeLocationUpdated(location.getTime(),
                                        location.getLatitude(),
                                        location.getLongitude(),
                                        location.getAccuracy(),
@@ -693,7 +693,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       mLastCompassData = new LastCompassData();
 
     mLastCompassData.update(getWindowManager().getDefaultDisplay().getRotation(), magneticNorth, trueNorth);
-    mMapFragment.nativeCompassUpdated(mLastCompassData.magneticNorth, mLastCompassData.trueNorth, false);
+    MapFragment.nativeCompassUpdated(mLastCompassData.magneticNorth, mLastCompassData.trueNorth, false);
 
     mPlacePage.refreshAzimuth(mLastCompassData.north);
     mNavigationController.updateNorth(mLastCompassData.north);
@@ -775,7 +775,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private void adjustZoomButtons()
   {
-    boolean show = (RoutingController.get().isNavigating() || Config.showZoomButtons());
+    final boolean show = showZoomButtons();
     UiUtils.showIf(show, mBtnZoomIn, mBtnZoomOut);
 
     if (!show)
@@ -799,6 +799,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
     });
   }
 
+  private boolean showZoomButtons()
+  {
+    return RoutingController.get().isNavigating() || Config.showZoomButtons();
+  }
+
   @Override
   protected void onPause()
   {
@@ -1045,8 +1050,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
           adjustRuler(0, menuHeight);
         }
       });
-      Animations.disappearSliding(mBtnZoomOut, Animations.RIGHT, null);
-      Animations.disappearSliding(mBtnZoomIn, Animations.RIGHT, null);
+      if (showZoomButtons())
+      {
+        Animations.disappearSliding(mBtnZoomOut, Animations.RIGHT, null);
+        Animations.disappearSliding(mBtnZoomIn, Animations.RIGHT, null);
+      }
     }
     else
     {
@@ -1059,8 +1067,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
           adjustRuler(0, 0);
         }
       });
-      Animations.appearSliding(mBtnZoomOut, Animations.RIGHT, null);
-      Animations.appearSliding(mBtnZoomIn, Animations.RIGHT, null);
+      if (showZoomButtons())
+      {
+        Animations.appearSliding(mBtnZoomOut, Animations.RIGHT, null);
+        Animations.appearSliding(mBtnZoomIn, Animations.RIGHT, null);
+      }
     }
   }