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

Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev am: 985f21dd43

Browse Source 
am: 43369ea648

Change-Id: I7ae7a7d7d4ad2ea593ef01c6ed03bd161b5d5d0b
This commit is contained in:
Aran Ink
2019-06-21 15:27:42 -07:00
committed by android-build-merger
parent 89e543fe54 43369ea648
commit 49a40df62a
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;
}