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

Commit 93dd25cf authored by Aran Ink's avatar Aran Ink
Browse files

Add secure setting for Global Actions Panel debug mode. 

Changes grid-based power menu logic to use new debug setting.

Bug: 123397865
Bug: 127644235

Test: Automated tests pass. Manual testing turning off/on debug setting.
Change-Id: Ic95188bd10a433f5c58f0f37a098a872e65d8150
parent f3c1480e

core/java/android/provider/Settings.java

+7 −0
Original line number Diff line number Diff line
@@ -6513,6 +6513,13 @@ public final class Settings { 
        public static final String GLOBAL_ACTIONS_PANEL_AVAILABLE =

                "global_actions_panel_available";













        /**













         * Enables debug mode for the Global Actions Panel.













         * @hide













         */













        public static final String GLOBAL_ACTIONS_PANEL_DEBUG_ENABLED =













                "global_actions_panel_debug_enabled";



























        /**















         * Whether the hush gesture has ever been used















         * @hide

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -637,6 +637,7 @@ public class SettingsBackupTest {













                 Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES,















                 Settings.Secure.ENABLED_PRINT_SERVICES,















                 Settings.Secure.GLOBAL_ACTIONS_PANEL_AVAILABLE,













                 Settings.Secure.GLOBAL_ACTIONS_PANEL_DEBUG_ENABLED,















                 Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS,















                 Settings.Secure.INCALL_BACK_BUTTON_BEHAVIOR,















                 Settings.Secure.INPUT_METHOD_SELECTOR_VISIBILITY,

































packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java



+9
−2




























Original line number
Diff line number
Diff line








@@ -1768,13 +1768,20 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,













        }















    }





























    /**













     * Determines whether or not debug mode has been activated for the Global Actions Panel.













     */













    private static boolean isPanelDebugModeEnabled(Context context) {













        return Settings.Secure.getInt(context.getContentResolver(),













                Settings.Secure.GLOBAL_ACTIONS_PANEL_DEBUG_ENABLED, 0) == 1;













    }





























    /**















     * Determines whether or not the Global Actions menu should be forced to















     * use the newer grid-style layout.















     */















    private static boolean isForceGridEnabled(Context context) {













        return FeatureFlagUtils.isEnabled(context,













                FeatureFlagUtils.FORCE_GLOBAL_ACTIONS_GRID_ENABLED);













        return isPanelDebugModeEnabled(context);















    }































    /**