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

Fix conflict between metrics_constants and settings_enums.

Browse Source 
Change-Id: I483bf6b26f2f258f2e2f6f3d839deee4953c203d
Test: Automated tests pass.
Fixes: 135720071
This commit is contained in:
Aran Ink
2019-06-21 10:39:23 -04:00
parent 60af8df0d4
commit 08659ccdb7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2374,6 +2374,11 @@ 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 = 1728;
// OPEN: Settings > Display > Dark Theme
// CATEGORY: SETTINGS
// OS: Q
@@ -2384,9 +2389,4 @@ enum PageId {
// CATEGORY: SETTINGS
// OS: Q
MODULE_LICENSES_DASHBOARD = 1746;
// OPEN: Settings > System > Gestures > Global Actions Panel
// CATEGORY: SETTINGS
// OS: Q
GLOBAL_ACTIONS_PANEL_SETTINGS = 1800;
}