fixup! Settings: Hide settings that don't work when taskbar is enabled
Change-Id: Ic120471d40a0e07ec94729bc479ddc910dbad96a
diff --git a/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java b/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
index 15a6ade..0672b77 100644
--- a/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
+++ b/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
@@ -31,7 +31,7 @@
import com.android.settings.widget.SeekBarPreference;
import com.android.settingslib.search.SearchIndexable;
-import static com.android.systemui.shared.recents.utilities.Utilities.isTablet;
+import static com.android.systemui.shared.recents.utilities.Utilities.isLargeScreen;
import lineageos.providers.LineageSettings;
@@ -83,7 +83,7 @@
initSeekBarPreference(RIGHT_EDGE_SEEKBAR_KEY);
boolean isTaskbarEnabled = LineageSettings.System.getInt(getContext().getContentResolver(),
- LineageSettings.System.ENABLE_TASKBAR, isTablet(getContext()) ? 1 : 0) == 1;
+ LineageSettings.System.ENABLE_TASKBAR, isLargeScreen(getContext()) ? 1 : 0) == 1;
if (isTaskbarEnabled) {
getPreferenceScreen().removePreference(
getPreferenceScreen().findPreference(NAVIGATION_BAR_HINT_KEY));
diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
index 6c00dee..9a44098 100644
--- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
+++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
@@ -56,7 +56,7 @@
import com.android.settingslib.widget.IllustrationPreference;
import com.android.settingslib.widget.SelectorWithWidgetPreference;
-import static com.android.systemui.shared.recents.utilities.Utilities.isTablet;
+import static com.android.systemui.shared.recents.utilities.Utilities.isLargeScreen;
import lineageos.providers.LineageSettings;
@@ -191,7 +191,7 @@
List<CandidateInfoExtra> candidates = new ArrayList<>();
boolean isTaskbarEnabled = LineageSettings.System.getInt(getContext().getContentResolver(),
- LineageSettings.System.ENABLE_TASKBAR, isTablet(getContext()) ? 1 : 0) == 1;
+ LineageSettings.System.ENABLE_TASKBAR, isLargeScreen(getContext()) ? 1 : 0) == 1;
if (SystemNavigationPreferenceController.isOverlayPackageAvailable(c,
NAV_BAR_MODE_GESTURAL_OVERLAY)) {