Skip to content

Commit 04738ea

Browse files
committed
Close keyboard first when backing out of search
1 parent 9a292e3 commit 04738ea

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,11 +720,14 @@ private void showDeleteSuggestionDialog(final SuggestionItem item) {
720720

721721
@Override
722722
public boolean onBackPressed() {
723+
if (KeyboardUtil.isKeyboardVisible(activity, searchEditText)) {
724+
hideKeyboardSearch();
725+
return true;
726+
}
723727
if (suggestionsPanelVisible
724728
&& !infoListAdapter.getItemsList().isEmpty()
725729
&& !isLoading.get()) {
726730
hideSuggestionsPanel();
727-
hideKeyboardSearch();
728731
searchEditText.setText(lastSearchedString);
729732
return true;
730733
}

app/src/main/java/org/schabi/newpipe/util/KeyboardUtil.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,13 @@ public static void hideKeyboard(final Activity activity, final EditText editText
5252

5353
editText.clearFocus();
5454
}
55+
56+
public static boolean isKeyboardVisible(final Activity activity, final EditText editText) {
57+
if (activity == null || editText == null) {
58+
return false;
59+
}
60+
final InputMethodManager imm = ContextCompat.getSystemService(activity,
61+
InputMethodManager.class);
62+
return imm.isActive(editText);
63+
}
5564
}

0 commit comments

Comments
 (0)