diff options
| author | alexzatsepin <alexander.zatzepin@gmail.com> | 2016-09-26 10:52:20 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-09-26 15:05:30 +0300 |
| commit | da12a3cf4fa1c102934e111dc803ee625d480208 (patch) | |
| tree | 24c94b677100859523f605acab93a4d7f35fb22e | |
| parent | 26b2dc67502f8359c141ee3c37f899e743a95804 (diff) | |
[android] Fixed unexpected hidding of the bottom menu when we come back via back button from the routing/planning mode
| -rw-r--r-- | android/src/com/mapswithme/maps/MwmActivity.java | 3 | ||||
| -rw-r--r-- | android/src/com/mapswithme/maps/widget/ToolbarController.java | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 0f1cdb52cc..027f1ccaa1 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -1297,7 +1297,10 @@ public class MwmActivity extends BaseMwmFragmentActivity || RoutingController.get().isErrorEncountered()) { mMainMenu.showLineFrame(false); + return; } + + mMainMenu.showLineFrame(true); } @Override diff --git a/android/src/com/mapswithme/maps/widget/ToolbarController.java b/android/src/com/mapswithme/maps/widget/ToolbarController.java index 81e3f987be..d780a1d24e 100644 --- a/android/src/com/mapswithme/maps/widget/ToolbarController.java +++ b/android/src/com/mapswithme/maps/widget/ToolbarController.java @@ -44,7 +44,8 @@ public class ToolbarController } } - protected @IdRes int getToolbarId() + @IdRes + private int getToolbarId() { return R.id.toolbar; } |