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

Merge "Add secure settings for Global Actions Panel." into qt-dev

Browse Source 
am: c8cb13a537

Change-Id: I9afd4501b7f28e358394ee49b8537d26f9ab72db
This commit is contained in:
Aran Ink
2019-05-08 12:14:42 -07:00
committed by android-build-merger
parent 9460e54abc c8cb13a537
commit 2d4fdc05e7
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6498,6 +6498,21 @@ public final class Settings {
private static final Validator TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES_VALIDATOR =
new SettingsValidators.ComponentNameListValidator(":");
/**
* Whether the Global Actions Panel is enabled.
* @hide
*/
public static final String GLOBAL_ACTIONS_PANEL_ENABLED = "global_actions_panel_enabled";
private static final Validator GLOBAL_ACTIONS_PANEL_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;
/**
* Whether the Global Actions Panel can be toggled on or off in Settings.
* @hide
*/
public static final String GLOBAL_ACTIONS_PANEL_AVAILABLE =
"global_actions_panel_available";
/**
* Whether the hush gesture has ever been used
* @hide
@@ -8937,7 +8952,8 @@ public final class Settings {
SILENCE_NOTIFICATION_GESTURE_COUNT,
SILENCE_CALL_GESTURE_COUNT,
SILENCE_TIMER_GESTURE_COUNT,
DARK_MODE_DIALOG_SEEN
DARK_MODE_DIALOG_SEEN,
GLOBAL_ACTIONS_PANEL_ENABLED
};
/**
@@ -9121,6 +9137,7 @@ public final class Settings {
VALIDATORS.put(ODI_CAPTIONS_ENABLED, ODI_CAPTIONS_ENABLED_VALIDATOR);
VALIDATORS.put(DARK_MODE_DIALOG_SEEN, BOOLEAN_VALIDATOR);
VALIDATORS.put(UI_NIGHT_MODE, UI_NIGHT_MODE_VALIDATOR);
VALIDATORS.put(GLOBAL_ACTIONS_PANEL_ENABLED, GLOBAL_ACTIONS_PANEL_ENABLED_VALIDATOR);
}
/**

5
core/proto/android/app/settings_enums.proto
View File

@@ -2364,4 +2364,9 @@ enum PageId {
// Settings > Apps and notifications > Notifications > Gentle notifications
GENTLE_NOTIFICATIONS_SCREEN = 1715;
// OPEN: Settings > System > Gestures > Global Actions Panel
// CATEGORY: SETTINGS
// OS: Q
GLOBAL_ACTIONS_PANEL_SETTINGS = 1800;
}

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

@@ -636,6 +636,7 @@ public class SettingsBackupTest {
Settings.Secure.ENABLED_NOTIFICATION_LISTENERS,
Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES,
Settings.Secure.ENABLED_PRINT_SERVICES,
Settings.Secure.GLOBAL_ACTIONS_PANEL_AVAILABLE,
Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS,
Settings.Secure.INCALL_BACK_BUTTON_BEHAVIOR,
Settings.Secure.INPUT_METHOD_SELECTOR_VISIBILITY,
@@ -798,4 +799,3 @@ public class SettingsBackupTest {
}
}