commit 78e7d4e6d0ed54da05436ee9e42ab457a1469ebd
author LuK1337 <priv.luk@gmail.com> Mon Mar 24 14:56:53 2025 +0100
committer LuK1337 <priv.luk@gmail.com> Mon Mar 24 15:17:14 2025 +0100
tree df8eb002bd6ca39abcc58d8410a079fb82f4f439
parent eeb98bae9a18f31ba378930917143ab52d1778ab

Revert "Hide navigation hint checkbox when taskbar is enabled"

This reverts commit a5ba5dfaad61864bff19f431d6ff7084decc2f42.

Change-Id: I567fb5dfaa8d937892b9333dd518ce30a9a4949b

src/org/lineageos/setupwizard/NavigationSettingsActivity.java

diff --git a/src/org/lineageos/setupwizard/NavigationSettingsActivity.java b/src/org/lineageos/setupwizard/NavigationSettingsActivity.java
index 65d7b92..a39389c 100644
--- a/src/org/lineageos/setupwizard/NavigationSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/NavigationSettingsActivity.java
@@ -34,8 +34,6 @@
 
     private SetupWizardApp mSetupWizardApp;
 
-    private boolean mIsTaskbarEnabled;
-
     private String mSelection = NAV_BAR_MODE_GESTURAL_OVERLAY;
 
     private CheckBox mHideGesturalHint;
@@ -49,8 +47,6 @@
         if (mSetupWizardApp.getSettingsBundle().containsKey(DISABLE_NAV_KEYS)) {
             navBarEnabled = mSetupWizardApp.getSettingsBundle().getBoolean(DISABLE_NAV_KEYS);
         }
-        mIsTaskbarEnabled = LineageSettings.System.getInt(getContentResolver(),
-                LineageSettings.System.ENABLE_TASKBAR, isLargeScreen(this) ? 1 : 0) == 1;
 
         int deviceKeys = getResources().getInteger(
                 org.lineageos.platform.internal.R.integer.config_deviceHardwareKeys);
@@ -90,11 +86,6 @@
         final RadioGroup radioGroup = findViewById(R.id.navigation_radio_group);
         mHideGesturalHint = findViewById(R.id.hide_navigation_hint);
 
-        // Hide navigation hint checkbox when taskbar is enabled
-        if (mIsTaskbarEnabled) {
-            mHideGesturalHint.setVisibility(View.GONE);
-        }
-
         radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
             switch (checkedId) {
                 case R.id.radio_gesture:
@@ -120,10 +111,6 @@
     }
 
     private void revealHintCheckbox() {
-        if (mIsTaskbarEnabled) {
-            return;
-        }
-
         mHideGesturalHint.animate().cancel();
 
         if (mHideGesturalHint.getVisibility() == View.VISIBLE) {
@@ -139,10 +126,6 @@
     }
 
     private void hideHintCheckBox() {
-        if (mIsTaskbarEnabled) {
-            return;
-        }
-
         if (mHideGesturalHint.getVisibility() == View.INVISIBLE) {
             return;
         }
@@ -162,12 +145,10 @@
     @Override
     protected void onNextPressed() {
         mSetupWizardApp.getSettingsBundle().putString(NAVIGATION_OPTION_KEY, mSelection);
-        if (!mIsTaskbarEnabled) {
-            boolean hideHint = mHideGesturalHint.isChecked();
-            LineageSettings.System.putIntForUser(getContentResolver(),
-                    LineageSettings.System.NAVIGATION_BAR_HINT, hideHint ? 0 : 1,
-                    UserHandle.USER_CURRENT);
-        }
+        boolean hideHint = mHideGesturalHint.isChecked();
+        LineageSettings.System.putIntForUser(getContentResolver(),
+                LineageSettings.System.NAVIGATION_BAR_HINT, hideHint ? 0 : 1,
+                UserHandle.USER_CURRENT);
         super.onNextPressed();
     }