diff options
| author | 2019-06-21 15:18:28 -0700 | |
|---|---|---|
| committer | 2019-06-21 15:18:28 -0700 | |
| commit | b3be57b74cc15a22e55b346137411dcfc9ef520c (patch) | |
| tree | 0a39f9304a03385b0fd2e2f4e30ad2f97350d3dd | |
| parent | 46cb9bed227eb3a015d97edf0eb04a4d4247d1bc (diff) | |
| parent | 985f21dd43694c0f22b863a85604a63b2d42c475 (diff) | |
Merge "Fix conflict between metrics_constants and settings_enums." into qt-dev
am: 985f21dd43
Change-Id: I9e279d5ccae2ce43a30e217bccd34df3a200285e
| -rw-r--r-- | core/proto/android/app/settings_enums.proto | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto index 4b6a6dec4c45..616419143747 100644 --- a/core/proto/android/app/settings_enums.proto +++ b/core/proto/android/app/settings_enums.proto @@ -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; } |