Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ed998963 authored by LuK1337's avatar LuK1337 Committed by Michael Bestas
Browse files

Settings: Hide settings that don't work when taskbar is enabled 

Change-Id: I81f0f8ad645bec95579bd0487f3f1098ab5823df
parent 94e49b62

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ android_library { 
        "org.lineageos.platform.internal",

        "LineagePreferenceLib",

        "vendor.lineage.fastcharge-V1.0-java",

        "SystemUISharedLib",

    ],



    plugins: ["androidx.room_room-compiler-plugin"],

src/com/android/settings/gestures/GestureNavigationSettingsFragment.java

+13 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ import com.android.settings.widget.LabeledSeekBarPreference; 
import com.android.settings.widget.SeekBarPreference;

import com.android.settingslib.search.SearchIndexable;



import static com.android.systemui.shared.recents.utilities.Utilities.isLargeScreen;



import lineageos.providers.LineageSettings;



/**

 * A fragment to include all the settings related to Gesture Navigation mode.

 */
@@ -45,6 +49,8 @@ public class GestureNavigationSettingsFragment extends DashboardFragment { 
    private static final String LEFT_EDGE_SEEKBAR_KEY = "gesture_left_back_sensitivity";

    private static final String RIGHT_EDGE_SEEKBAR_KEY = "gesture_right_back_sensitivity";



    private static final String NAVIGATION_BAR_HINT_KEY = "navigation_bar_hint";



    private WindowManager mWindowManager;

    private BackGestureIndicatorView mIndicatorView;
@@ -75,6 +81,13 @@ public class GestureNavigationSettingsFragment extends DashboardFragment { 


        initSeekBarPreference(LEFT_EDGE_SEEKBAR_KEY);

        initSeekBarPreference(RIGHT_EDGE_SEEKBAR_KEY);



        boolean isTaskbarEnabled = LineageSettings.System.getInt(getContext().getContentResolver(),

                LineageSettings.System.ENABLE_TASKBAR, isLargeScreen(getContext()) ? 1 : 0) == 1;

        if (isTaskbarEnabled) {

            getPreferenceScreen().removePreference(

                    getPreferenceScreen().findPreference(NAVIGATION_BAR_HINT_KEY));

        }

    }



    @Override

src/com/android/settings/gestures/SystemNavigationGestureSettings.java

+8 −1
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ import com.android.settingslib.widget.CandidateInfo; 
import com.android.settingslib.widget.IllustrationPreference;

import com.android.settingslib.widget.SelectorWithWidgetPreference;



import static com.android.systemui.shared.recents.utilities.Utilities.isLargeScreen;



import lineageos.providers.LineageSettings;



import java.util.ArrayList;

import java.util.List;
@@ -196,6 +200,9 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i 
        final Context c = getContext();

        List<CandidateInfoExtra> candidates = new ArrayList<>();



        boolean isTaskbarEnabled = LineageSettings.System.getInt(getContext().getContentResolver(),

                LineageSettings.System.ENABLE_TASKBAR, isLargeScreen(getContext()) ? 1 : 0) == 1;



        if (SystemNavigationPreferenceController.isOverlayPackageAvailable(c,

                NAV_BAR_MODE_GESTURAL_OVERLAY)) {

            candidates.add(new CandidateInfoExtra(
@@ -203,7 +210,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i 
                    c.getText(R.string.edge_to_edge_navigation_summary),

                    KEY_SYSTEM_NAV_GESTURAL, true /* enabled */));

        }

        if (SystemNavigationPreferenceController.isOverlayPackageAvailable(c,

        if (!isTaskbarEnabled && SystemNavigationPreferenceController.isOverlayPackageAvailable(c,

                NAV_BAR_MODE_2BUTTON_OVERLAY)) {

            candidates.add(new CandidateInfoExtra(

                    c.getText(R.string.swipe_up_to_switch_apps_title),