pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Further simplify back press handling

Browse source 
This commit makes the place page close before search on back press.

Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
This commit is contained in:
Arnaud Vergnet 2022-02-06 17:54:28 +01:00 • committed by Viktor Govako
parent 0ade105df0
commit 25964f41ef
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -750,12 +750,17 @@ public class MwmActivity extends BaseMwmFragmentActivity
return false;
}
private void closeBookmarkCategoryToolbar()
/**
* @return False if the bookmark category toolbar was already closed, true otherwise
*/
private boolean closeBookmarkCategoryToolbar()
{
if (UiUtils.isVisible(mBookmarkCategoryToolbar))
{
hideBookmarkCategoryToolbar();
return true;
}
return false;
}
private void closeFloatingToolbarsAndPanels(boolean clearSearchText)
@ -1130,23 +1135,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
return;
}
if (closeMenu())
{
return;
}
if (closeSearchToolbar(true, true))
{
return;
}
if (UiUtils.isVisible(mBookmarkCategoryToolbar) && mPlacePageController.isClosed())
{
hideBookmarkCategoryToolbar();
return;
}
if (closePlacePage() || closeSidePanel() || closePositionChooser())
if (closeMenu() || closePlacePage() || closeSearchToolbar(true, true) ||
closeBookmarkCategoryToolbar() || closeSidePanel() || closePositionChooser())
{
return;
}