Cancel search on back

This commit is contained in:
M66B 2021-07-02 08:52:56 +02:00
parent a275e930da
commit c599b323b7
1 changed files with 9 additions and 0 deletions

View File

@ -5933,6 +5933,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
etSearch.setActionEnabled(hasNext);
}
private boolean isSearching() {
return (searchView != null);
}
private void clearSearch() {
if (searchView != null)
searchView.clearComposingText();
@ -6013,6 +6017,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override
public boolean onBackPressed() {
if (isSearching()) {
endSearch();
return true;
}
if (selectionTracker != null && selectionTracker.hasSelection()) {
selectionTracker.clearSelection();
return true;