From 1b45884632a10093d455eb6aa09ebda35a0919f0 Mon Sep 17 00:00:00 2001
From: nyyu <mail@nyyu.dev>
Date: Sun, 18 Sep 2022 11:44:26 +0200
Subject: [PATCH] fix: always enable taskbar toggle

Change-Id: I247db667bec92fabcdbe7bd84946e79bae7e0bb6
---
 .../lineageparts/input/ButtonSettings.java      | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/org/lineageos/lineageparts/input/ButtonSettings.java b/src/org/lineageos/lineageparts/input/ButtonSettings.java
index a6fa54f..4e326d3 100644
--- a/src/org/lineageos/lineageparts/input/ButtonSettings.java
+++ b/src/org/lineageos/lineageparts/input/ButtonSettings.java
@@ -475,15 +475,11 @@ public class ButtonSettings extends SettingsPreferenceFragment

         mEnableTaskbar = findPreference(KEY_ENABLE_TASKBAR);
         if (mEnableTaskbar != null) {
-            if (!isTablet(getContext()) || !hasNavigationBar()) {
-                mNavigationPreferencesCat.removePreference(mEnableTaskbar);
-            } else {
-                mEnableTaskbar.setOnPreferenceChangeListener(this);
-                mEnableTaskbar.setChecked(LineageSettings.System.getInt(resolver,
-                        LineageSettings.System.ENABLE_TASKBAR,
-                        isTablet(getContext()) ? 1 : 0) == 1);
-                toggleTaskBarDependencies(mEnableTaskbar.isChecked());
-            }
+            mEnableTaskbar.setOnPreferenceChangeListener(this);
+            mEnableTaskbar.setChecked(LineageSettings.System.getInt(resolver,
+                LineageSettings.System.ENABLE_TASKBAR,
+                isTablet(getContext()) ? 1 : 0) == 1);
+            toggleTaskBarDependencies(mEnableTaskbar.isChecked());
         }

         List<Integer> unsupportedValues = new ArrayList<>();
@@ -867,6 +863,9 @@ public class ButtonSettings extends SettingsPreferenceFragment
             return true;
         } else if (preference == mDisableNavigationKeys) {
             mDisableNavigationKeys.setEnabled(false);
+            mEnableTaskbar.setChecked(false);
+            LineageSettings.System.putInt(getContentResolver(),
+                LineageSettings.System.ENABLE_TASKBAR, 0);
             mNavigationPreferencesCat.setEnabled(false);
             if (!mDisableNavigationKeys.isChecked()) {
                 setButtonNavigationMode(NAV_BAR_MODE_3BUTTON_OVERLAY);