From be7e9bf6eaaed5e9f3f1c2910f145ba97b933f15 Mon Sep 17 00:00:00 2001 From: Arnaud Vergnet Date: Sat, 5 Feb 2022 15:41:26 +0100 Subject: [PATCH] [android] Properly sync search wheel with toolbar Signed-off-by: Arnaud Vergnet --- android/src/com/mapswithme/maps/MwmActivity.java | 4 ++-- .../maps/search/FloatingSearchToolbarController.java | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index a67fdcb94c..a8273ba81c 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -2022,13 +2022,13 @@ public class MwmActivity extends BaseMwmFragmentActivity @Override public void onSearchClearClick() { - closePlacePage(); + closeSearchToolbar(true, true); } @Override public void onSearchUpClick(@Nullable String query) { - closePlacePage(); + closeFloatingToolbarsAndPanels(true, true); showSearch(query); } diff --git a/android/src/com/mapswithme/maps/search/FloatingSearchToolbarController.java b/android/src/com/mapswithme/maps/search/FloatingSearchToolbarController.java index 12086aa105..9eb747bc0c 100644 --- a/android/src/com/mapswithme/maps/search/FloatingSearchToolbarController.java +++ b/android/src/com/mapswithme/maps/search/FloatingSearchToolbarController.java @@ -34,7 +34,6 @@ public class FloatingSearchToolbarController extends SearchToolbarController { if (mListener != null) mListener.onSearchUpClick(getQuery()); - cancelSearchApiAndHide(true); } @Override @@ -52,7 +51,6 @@ public class FloatingSearchToolbarController extends SearchToolbarController super.onClearClick(); if (mListener != null) mListener.onSearchClearClick(); - cancelSearchApiAndHide(false); } public void refreshQuery()