diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 64a0ed9bb0..2fab929e24 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -1588,13 +1588,19 @@ public class MwmActivity extends BaseMwmFragmentActivity return; } - if (mSearchController != null && mSearchController.hide()) + if (mSearchController != null) { - SearchEngine.INSTANCE.cancelInteractiveSearch(); - if (mFilterController != null) - mFilterController.resetFilterAndParams(); - mSearchController.clear(); - return; + if (mSearchController.closeBottomMenu()) + return; + + if (mSearchController.hide()) + { + SearchEngine.INSTANCE.cancelInteractiveSearch(); + if (mFilterController != null) + mFilterController.resetFilterAndParams(); + mSearchController.clear(); + return; + } } boolean isRoutingCancelled = RoutingController.get().cancel(); diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java index 50f7cf433c..970c438246 100644 --- a/android/src/com/mapswithme/maps/search/SearchFragment.java +++ b/android/src/com/mapswithme/maps/search/SearchFragment.java @@ -711,6 +711,9 @@ public class SearchFragment extends BaseMwmFragment @Override public boolean onBackPressed() { + if (mToolbarController.closeBottomMenu()) + return true; + if (mToolbarController.hasQuery()) { mToolbarController.clear();