Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add secure setting for Global Actions Panel debug mode.

Browse Source 
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
This commit is contained in:
Aran Ink
2019-05-09 14:42:14 -04:00
parent f3c1480ea7
commit 93dd25cfe7
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/provider/Settings.java
View File

@@ -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

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -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,

11
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
View File

@@ -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);
}
/**