commit 43369ea648927d73b11bdc846bab0c0081ece551
author Aran Ink <nesciosquid@google.com> Fri Jun 21 15:18:29 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 21 15:18:29 2019 -0700
tree 5db3008601445341a4a1f365ab4668cb64cadda6
parent e4a6ca723154210dd5355da994e150afa6da82f3
parent 985f21dd43694c0f22b863a85604a63b2d42c475

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

Change-Id: I3c148d970cb95a4de752270ca6bbe6e5db2d77d1

core/proto/android/app/settings_enums.proto

diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto
index 4b6a6de..6164191 100644
--- a/core/proto/android/app/settings_enums.proto
+++ b/core/proto/android/app/settings_enums.proto
@@ -2374,6 +2374,11 @@
     // 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 @@
     // CATEGORY: SETTINGS
     // OS: Q
     MODULE_LICENSES_DASHBOARD = 1746;
-
-    // OPEN: Settings > System > Gestures > Global Actions Panel
-    // CATEGORY: SETTINGS
-    // OS: Q
-    GLOBAL_ACTIONS_PANEL_SETTINGS = 1800;
 }