Merge pull request #11358 from t895/close-soft-keyboard

Android: Close soft keyboard on panel close

1 files changed, 10 insertions, 0 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/TwoPaneOnBackPressedCallback.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/TwoPaneOnBackPressedCallback.java
index a6a0da5f97..0ab829fa77 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/TwoPaneOnBackPressedCallback.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/TwoPaneOnBackPressedCallback.java
@@ -2,7 +2,9 @@
 
 package org.dolphinemu.dolphinemu.ui;
 
+import android.content.Context;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
@@ -40,7 +42,15 @@ public class TwoPaneOnBackPressedCallback extends OnBackPressedCallback
   @Override
   public void onPanelClosed(@NonNull View panel)
   {
+    closeKeyboard();
     setEnabled(false);
   }
+
+  private void closeKeyboard()
+  {
+    InputMethodManager manager = (InputMethodManager) mSlidingPaneLayout.getContext()
+            .getSystemService(Context.INPUT_METHOD_SERVICE);
+    manager.hideSoftInputFromWindow(mSlidingPaneLayout.getRootView().getWindowToken(), 0);
+  }
 }