From a849cac96dd864a4b911206d8227d5b1245939cc Mon Sep 17 00:00:00 2001
From: Ronald Y <knyipab@gmail.com>
Date: Tue, 30 Apr 2024 22:05:59 +0800
Subject: [PATCH 1/4] option to adjust display height for EK bar

---
 app/src/main/java/com/termux/x11/MainActivity.java | 2 +-
 app/src/main/res/xml/preferences.xml               | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java
index b375c332a..efb1d2b6a 100644
--- a/app/src/main/java/com/termux/x11/MainActivity.java
+++ b/app/src/main/java/com/termux/x11/MainActivity.java
@@ -631,6 +631,7 @@ public void toggleExtraKeys(boolean visible, boolean saveState) {
                 parent.removeView(pager);
                 parent.addView(pager, 0);
             }
+            frm.setPadding(0, 0, 0, preferences.getBoolean("adjustHeightForEK", false) && show ? pager.getHeight() : 0);
 
             if (enabled && saveState) {
                 SharedPreferences.Editor edit = preferences.edit();
@@ -801,7 +802,6 @@ public void onUserLeaveHint() {
     public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, @NonNull Configuration newConfig) {
         toggleExtraKeys(!isInPictureInPictureMode, false);
 
-        frm.setPadding(0, 0, 0, 0);
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);
     }
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 536e8784f..d660e59d3 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -181,4 +181,11 @@
             android:title="Request notification permission"
             android:key="requestNotificationPermission" />
     </PreferenceCategory>
+
+    <PreferenceCategory android:key="experimental" android:title="Experimental">
+        <SwitchPreferenceCompat
+            android:title="Adjust display height for extra keys bar"
+            android:defaultValue="false"
+            android:key="adjustHeightForEK" />
+    </PreferenceCategory>
 </PreferenceScreen>

From 52ca94171d4e43dd325579832f56a42b9e2e72d6 Mon Sep 17 00:00:00 2001
From: Ronald Y <knyipab@gmail.com>
Date: Fri, 3 May 2024 01:45:13 +0800
Subject: [PATCH 2/4] onPreferencesChanged for "adjust height for EK bar"

---
 app/src/main/java/com/termux/x11/MainActivity.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java
index efb1d2b6a..a196b2177 100644
--- a/app/src/main/java/com/termux/x11/MainActivity.java
+++ b/app/src/main/java/com/termux/x11/MainActivity.java
@@ -556,6 +556,9 @@ void onPreferencesChanged(String key) {
             buttons.setVisibility(View.GONE);
         }
 
+        View pager = getTerminalToolbarViewPager();
+        frm.setPadding(0, 0, 0, p.getBoolean("adjustHeightForEK", false) && pager.getVisibility() == View.VISIBLE ? pager.getHeight() : 0);
+
         lorieView.requestLayout();
         lorieView.invalidate();
     }

From 920a87ceace167d8e1036ce979c771529a4caaa1 Mon Sep 17 00:00:00 2001
From: Ronald Y <knyipab@gmail.com>
Date: Sat, 11 May 2024 08:18:43 +0800
Subject: [PATCH 3/4] fix initial incorrect initial height

---
 app/src/main/java/com/termux/x11/MainActivity.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java
index a196b2177..e1f67fc72 100644
--- a/app/src/main/java/com/termux/x11/MainActivity.java
+++ b/app/src/main/java/com/termux/x11/MainActivity.java
@@ -556,9 +556,6 @@ void onPreferencesChanged(String key) {
             buttons.setVisibility(View.GONE);
         }
 
-        View pager = getTerminalToolbarViewPager();
-        frm.setPadding(0, 0, 0, p.getBoolean("adjustHeightForEK", false) && pager.getVisibility() == View.VISIBLE ? pager.getHeight() : 0);
-
         lorieView.requestLayout();
         lorieView.invalidate();
     }
@@ -616,6 +613,7 @@ private void setTerminalToolbarView() {
                         (mExtraKeys.getExtraKeysInfo() == null ? 0 : mExtraKeys.getExtraKeysInfo().getMatrix().length));
                 terminalToolbarViewPager.setLayoutParams(layoutParams);
             }
+            frm.setPadding(0, 0, 0, preferences.getBoolean("adjustHeightForEK", false) && terminalToolbarViewPager.getVisibility() == View.VISIBLE ? terminalToolbarViewPager.getHeight() : 0);
         }, 200);
     }
 

From 762fe769ba15c11d277da42efc293a1c03a5226c Mon Sep 17 00:00:00 2001
From: Twaik Yont <twaikyont@gmail.com>
Date: Thu, 16 May 2024 10:12:52 +0300
Subject: [PATCH 4/4] Update preferences.xml [no ci]

---
 app/src/main/res/xml/preferences.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index d660e59d3..13225eb1b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -64,6 +64,12 @@
 	        android:title="Keep Screen On"
             android:defaultValue="true"
             android:key="keepScreenOn" />
+
+        <SwitchPreferenceCompat
+            android:title="Adjust display height for extra keys bar"
+            android:summary="May cause screen flickering during toggling EK bar"
+            android:defaultValue="false"
+            android:key="adjustHeightForEK" />
     </PreferenceCategory>
     <PreferenceCategory android:key="pointer" android:title="Pointer">
         <ListPreference
@@ -181,11 +187,4 @@
             android:title="Request notification permission"
             android:key="requestNotificationPermission" />
     </PreferenceCategory>
-
-    <PreferenceCategory android:key="experimental" android:title="Experimental">
-        <SwitchPreferenceCompat
-            android:title="Adjust display height for extra keys bar"
-            android:defaultValue="false"
-            android:key="adjustHeightForEK" />
-    </PreferenceCategory>
 </PreferenceScreen>