From 7d6258599c9f4d6a9ee3edb9eb93a990981bf280 Mon Sep 17 00:00:00 2001 From: Roman Romanov Date: Thu, 2 Feb 2017 12:34:44 +0400 Subject: [PATCH 1/2] [android] Fix start navigation in the tablet landscape mode. --- android/src/com/mapswithme/maps/MwmActivity.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index d32d68bae2..0b14221c87 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -652,6 +652,19 @@ public class MwmActivity extends BaseMwmFragmentActivity return false; } + public void closeAllFloatingPanels() + { + if (!mIsFragmentContainer) + return; + + closePlacePage(); + if (removeCurrentFragment(true)) + { + InputUtils.hideKeyboard(mFadeView); + mFadeView.fadeOut(); + } + } + public void closeMenu(String statEvent, String alohaStatEvent, @Nullable Runnable procAfterClose) { Statistics.INSTANCE.trackEvent(statEvent); @@ -1573,7 +1586,7 @@ public class MwmActivity extends BaseMwmFragmentActivity { if (mIsFragmentContainer) { - closeSidePanel(); + closeAllFloatingPanels(); adjustTraffic(0, UiUtils.getStatusBarHeight(getApplicationContext())); } else From 473d2a7b1b264239d3d553c198726af152fdf8f1 Mon Sep 17 00:00:00 2001 From: Roman Romanov Date: Fri, 3 Feb 2017 12:50:31 +0400 Subject: [PATCH 2/2] [android] Review fixes. --- android/src/com/mapswithme/maps/MwmActivity.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 0b14221c87..a4f8824418 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -652,7 +652,7 @@ public class MwmActivity extends BaseMwmFragmentActivity return false; } - public void closeAllFloatingPanels() + private void closeAllFloatingPanels() { if (!mIsFragmentContainer) return; @@ -1585,14 +1585,11 @@ public class MwmActivity extends BaseMwmFragmentActivity else { if (mIsFragmentContainer) - { - closeAllFloatingPanels(); adjustTraffic(0, UiUtils.getStatusBarHeight(getApplicationContext())); - } else - { mRoutingPlanInplaceController.show(false); - } + + closeAllFloatingPanels(); if (completionListener != null) completionListener.run();