From 08659ccdb72b4c578e4b83fcc9e549a9c27f4b75 Mon Sep 17 00:00:00 2001 From: Aran Ink Date: Fri, 21 Jun 2019 10:39:23 -0400 Subject: [PATCH] Fix conflict between metrics_constants and settings_enums. Change-Id: I483bf6b26f2f258f2e2f6f3d839deee4953c203d Test: Automated tests pass. Fixes: 135720071 --- core/proto/android/app/settings_enums.proto | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto index 4b6a6dec4c459..6164191437474 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; }