From b6c4c176e53cd78151ef8a3df4c850f65d74fd11 Mon Sep 17 00:00:00 2001
From: Alex <du.alexcruz@gmail.com>
Date: Mon, 5 Sep 2022 22:24:23 +0700
Subject: [PATCH] Cherish:Allow enabling compact layout of navigation bar[2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/xml/cherish_settings_button.xml                | 14 +++++++++++++-
 .../cherish/settings/fragments/ButtonSettings.java | 12 ++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/res/xml/cherish_settings_button.xml b/res/xml/cherish_settings_button.xml
index 756017c..21bab5f 100644
--- a/res/xml/cherish_settings_button.xml
+++ b/res/xml/cherish_settings_button.xml
@@ -18,11 +18,23 @@
         android:title="@string/button_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 		
-	<com.cherish.settings.preferences.SystemSettingSwitchPreference
+	<PreferenceCategory
+        android:key="navigation_keys"
+        android:title="@string/navigation_bar_category">
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="navigation_bar_compact_layout"
+            android:title="@string/navigation_bar_compact_layout_title"
+            android:summary="@string/navigation_bar_compact_layout_summary"
+            android:defaultValue="false" />-->
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="navigation_bar_inverse"
             android:title="@string/navigation_bar_inverse_title"
             android:defaultValue="0"
             settings:controller="com.cherish.settings.fragments.NavBarInversePreferenceController" />
 
+    </PreferenceCategory>
+
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/com/cherish/settings/fragments/ButtonSettings.java b/src/com/cherish/settings/fragments/ButtonSettings.java
index 3274ab5..af183fb 100644
--- a/src/com/cherish/settings/fragments/ButtonSettings.java
+++ b/src/com/cherish/settings/fragments/ButtonSettings.java
@@ -49,6 +49,12 @@ import java.util.List;
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class ButtonSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
+			
+	private static final String KEY_NAVBAR_INVERSE = "navigation_bar_inverse";
+    private static final String KEY_NAVIGATION_COMPACT_LAYOUT = "navigation_bar_compact_layout";
+	
+	private SystemSettingSwitchPreference mNavbarInverse;
+    private SystemSettingSwitchPreference mNavigationCompactLayout;
 
 
     @Override
@@ -59,6 +65,12 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
         final Resources res = getResources();
         final ContentResolver resolver = getActivity().getContentResolver();
         final PreferenceScreen prefScreen = getPreferenceScreen();
+		
+		final boolean isThreeButtonNavbarEnabled = EvolutionUtils.isThemeEnabled("com.android.internal.systemui.navbar.threebutton");
+        mNavbarInverse = (SystemSettingSwitchPreference) findPreference(KEY_NAVBAR_INVERSE);
+        mNavbarInverse.setEnabled(isThreeButtonNavbarEnabled);
+        mNavigationCompactLayout = (SystemSettingSwitchPreference) findPreference(KEY_NAVIGATION_COMPACT_LAYOUT);
+        mNavigationCompactLayout.setEnabled(isThreeButtonNavbarEnabled);
     }
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {