fix focus

bleach86 · bleach86 · commit 4979e26bccd2 · 2022-10-10T17:19:04.000-05:00
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonActivity.java
@@ -404,6 +404,16 @@ public void run() {
             }
         });
     }
+    
+    
+        public void requestFocusForMainView() {
+        runOnUiThread(new Runnable() {
+            public void run() {
+                Log.v(TAG, "requestFocusForMainView is getting focus now.");
+                getSurface().requestFocus();
+            }
+        });
+    }
 
     public void removeLoadingScreen() {
         runOnUiThread(new Runnable() {
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/patches/SDLActivity.java.patch b/pythonforandroid/bootstraps/sdl2/build/src/patches/SDLActivity.java.patch
@@ -81,6 +81,16 @@
          SDLActivity.nativeRunMain(library, function, arguments);
 
          Log.v("SDL", "Finished main function");
+@@ -1993,6 +2018,9 @@ class DummyEdit extends View implements View.OnKeyListener {
+         if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
+             if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
+                 SDLActivity.onNativeKeyboardFocusLost();
++                // if targetSdkVersion >= 28, we explicitly need to give back focus
++                // see https://github.com/spesmilo/electrum/issues/6276
++                SDLActivity.mSurface.requestFocus();
+             }
+         }
+         return super.onKeyPreIme(keyCode, event);
 @@ -2002,7 +2028,7 @@
      public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
          ic = new SDLInputConnection(this, true);
