Revert "Allow users to disable terminal margin adjustment"

This reverts commit 3213502
termux · Jul 8, 2021 · 7aefd94 · 7aefd94
1 parent dc8bdfe
commit 7aefd94
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -259,8 +259,7 @@ public void onStart() {
         if (mTermuxTerminalViewClient != null)
             mTermuxTerminalViewClient.onStart();
 
-        if (!mProperties.isTerminalMarginAdjustmentDisabled())
-            addTermuxActivityRootViewGlobalLayoutListener();
+        addTermuxActivityRootViewGlobalLayoutListener();
 
         registerTermuxActivityBroadcastReceiver();
     }

diff --git a/...x-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java b/...x-shared/src/main/java/com/termux/shared/settings/properties/TermuxPropertyConstants.java
@@ -72,13 +72,6 @@ public final class TermuxPropertyConstants {
 
     /* boolean */
 
-    /** Defines the key for whether terminal view margin adjustment that is done to prevent soft
-     * keyboard from covering bottom part of terminal view on some devices is disabled or not.
-     * Margin adjustment may cause screen flickering on some devices and so should be disabled. */
-    public static final String KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT =  "disable-terminal-margin-adjustment"; // Default: "disable-terminal-margin-adjustment"
-
-
-
     /** Defines the key for whether a toast will be shown when user changes the terminal session */
     public static final String KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST =  "disable-terminal-session-change-toast"; // Default: "disable-terminal-session-change-toast"
 
@@ -302,7 +295,6 @@ public final class TermuxPropertyConstants {
      * */
     public static final Set<String> TERMUX_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
         /* boolean */
-        KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT,
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
@@ -343,7 +335,6 @@ public final class TermuxPropertyConstants {
      * default: false
      * */
     public static final Set<String> TERMUX_DEFAULT_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
-        KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT,
         KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
         KEY_ENFORCE_CHAR_BASED_INPUT,
         KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,

diff --git a/...ux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java b/...ux-shared/src/main/java/com/termux/shared/settings/properties/TermuxSharedProperties.java
@@ -460,10 +460,6 @@ public static String getVolumeKeysBehaviourInternalPropertyValueFromValue(String
 
 
 
-    public boolean isTerminalMarginAdjustmentDisabled() {
-        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_TERMINAL_MARGIN_ADJUSTMENT, true);
-    }
-
     public boolean areTerminalSessionChangeToastsDisabled() {
         return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST, true);
     }