Tweaks to maintaining keyboard state

harshad1 · Oct 7, 2023 · 0798067 · 0798067
1 parent 06d2c4a
commit 0798067
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -65,7 +65,7 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:taskAffinity=".activity.MainActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize">
+            android:windowSoftInputMode="stateUnchanged|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -179,7 +179,7 @@
             android:parentActivityName=".activity.MainActivity"
             android:taskAffinity=".activity.DocumentActivity"
             android:theme="@style/AppTheme.Unified.StartupFlash"
-            android:windowSoftInputMode="stateHidden|adjustResize"
+            android:windowSoftInputMode="stateUnchanged|adjustResize"
             tools:targetApi="lollipop">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"

diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java b/app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java
@@ -27,6 +27,8 @@
 import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
 import android.webkit.JavascriptInterface;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
@@ -99,7 +101,6 @@ public static DocumentEditAndViewFragment newInstance(final @NonNull Document do
     private MarkorWebViewClient _webViewClient;
     private boolean _nextConvertToPrintMode = false;
     private MenuItem _saveMenuItem, _undoMenuItem, _redoMenuItem;
-    private Boolean defocusImeState = null;
 
     public DocumentEditAndViewFragment() {
         super();
@@ -227,14 +228,23 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         });
         _hlEditor.addTextChangedListener(GsTextWatcherAdapter.after(s -> debounced.run()));
 
-        // Restore keyboard when we regain focus
+        // We set the keyboard to be hidden if it was hidden when we lost focus
+        // This works well to preserve keyboard state.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            final Window window = activity.getWindow();
+            final int adjustResize = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;
+            final int unchanged = WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED | adjustResize;
+            final int hidden = WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN | adjustResize;
+
             _hlEditor.getViewTreeObserver().addOnWindowFocusChangeListener(hasFocus -> {
-                if (hasFocus && defocusImeState != null) {
-                    _cu.showSoftKeyboard(getActivity(), defocusImeState, _hlEditor);
-                    defocusImeState = null;
+                if (hasFocus) {
+                    // Restore old state
+                    _hlEditor.postDelayed(() -> window.setSoftInputMode(unchanged), 500);
                 } else {
-                    defocusImeState = TextViewUtils.isImeOpen(_hlEditor);
+                    final Boolean isOpen = TextViewUtils.isImeOpen(_hlEditor);
+                    if (isOpen != null && !isOpen) {
+                        window.setSoftInputMode(hidden);
+                    }
                 }
             });
         }