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

Commit cc5db618 authored by Brandon Dayauon's avatar Brandon Dayauon Committed by Android (Google) Code Review
Browse files

Merge "Include a developer option sliding flag to toggle the different amount... 

Merge "Include a developer option sliding flag to toggle the different amount of apps to show" into main
parents d7f0ccf5 96901c45

quickstep/src/com/android/launcher3/uioverrides/flags/DeveloperOptionsUI.java

+11 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static com.android.launcher3.LauncherPrefs.LONG_PRESS_NAV_HANDLE_HAPTIC_H 
import static com.android.launcher3.LauncherPrefs.LONG_PRESS_NAV_HANDLE_HAPTIC_HINT_START_SCALE_PERCENT;

import static com.android.launcher3.LauncherPrefs.LONG_PRESS_NAV_HANDLE_SLOP_PERCENTAGE;

import static com.android.launcher3.LauncherPrefs.LONG_PRESS_NAV_HANDLE_TIMEOUT_MS;

import static com.android.launcher3.LauncherPrefs.PRIVATE_SPACE_APPS;

import static com.android.launcher3.settings.SettingsActivity.EXTRA_FRAGMENT_HIGHLIGHT_KEY;

import static com.android.launcher3.uioverrides.plugins.PluginManagerWrapper.PLUGIN_CHANGED;

import static com.android.launcher3.uioverrides.plugins.PluginManagerWrapper.pluginEnabledKey;
@@ -67,6 +68,7 @@ import androidx.preference.SeekBarPreference; 
import androidx.preference.SwitchPreference;



import com.android.launcher3.ConstantItem;

import com.android.launcher3.Flags;

import com.android.launcher3.LauncherPrefs;

import com.android.launcher3.R;

import com.android.launcher3.config.FeatureFlags;
@@ -115,6 +117,9 @@ public class DeveloperOptionsUI { 
            addAllAppsFromOverviewCatergory();

        }

        addCustomLpnhCategory();

        if (Flags.enablePrivateSpace()) {

            addCustomPrivateAppsCategory();

        }

    }



    private void filterPreferences(String query, PreferenceGroup pg) {
@@ -365,6 +370,12 @@ public class DeveloperOptionsUI { 
        }

    }



    private void addCustomPrivateAppsCategory() {

        PreferenceCategory category = newCategory("Apps in Private Space Config");

        category.addPreference(createSeekBarPreference(

                "Number of Apps to put in private region", 0, 100, 1, PRIVATE_SPACE_APPS));

    }



    /**

     * Create a preference with text and a seek bar. Should be added to a PreferenceCategory.

     *

src/com/android/launcher3/LauncherPrefs.kt

+7 −0
Original line number Diff line number Diff line
@@ -364,6 +364,13 @@ class LauncherPrefs(private val encryptedContext: Context) { 
                        EncryptionType.MOVE_TO_DEVICE_PROTECTED

                )

        @JvmField

        val PRIVATE_SPACE_APPS =

                nonRestorableItem(

                        "pref_private_space_apps",

                        0,

                        EncryptionType.MOVE_TO_DEVICE_PROTECTED

                )

        @JvmField

        val THEMED_ICONS =

            backedUpItem(Themes.KEY_THEMED_ICONS, false, EncryptionType.MOVE_TO_DEVICE_PROTECTED)

        @JvmField val PROMISE_ICON_IDS = backedUpItem(InstallSessionHelper.PROMISE_ICON_IDS, "")