Move Settings atom enums to its own file.

Bug: 117860032
Test: rebuild
Change-Id: I26f634c36de0cf946951d85f0000468e3726db23

2 files changed, 64 insertions, 42 deletions

diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto
index 7f6e41c1092f..60b2f34553e2 100644
--- a/cmds/statsd/src/atoms.proto
+++ b/cmds/statsd/src/atoms.proto
@@ -22,6 +22,7 @@ option java_outer_classname = "AtomsProto";
 
 import "frameworks/base/cmds/statsd/src/atom_field_options.proto";
 import "frameworks/base/core/proto/android/app/enums.proto";
+import "frameworks/base/core/proto/android/app/settings_enums.proto";
 import "frameworks/base/core/proto/android/app/job/enums.proto";
 import "frameworks/base/core/proto/android/bluetooth/enums.proto";
 import "frameworks/base/core/proto/android/os/enums.proto";
@@ -1445,59 +1446,20 @@ message PhoneStateChanged {
  */
 message SettingsUIChanged {
     /**
-     * The action performed in this event
-     */
-    enum Action {
-        ACTION_UNKNOWN = 0;
-        PAGE_VISIBLE = 1;
-        PAGE_HIDE = 2;
-        PREF_CHANGE = 3;
-    }
-
-    /**
-     * Id for Settings pages. Each page must have its own unique Id.
-     */
-    enum PageId {
-      // Unknown page. Should not be used in production code.
-      PAGE_UNKNOWN = 0;
-
-      // OPEN: Settings homepage
-      SETTINGS_HOMEPAGE = 1502;
-
-      // OPEN: Settings > System > Input & Gesture > Wake screen
-      SETTINGS_GESTURE_WAKE_SCREEN = 1570;
-
-      // OPEN: Settings > Network & internet > Mobile network
-      MOBILE_NETWORK = 1571;
-
-      // OPEN: Settings > Network & internet > Mobile network > Choose network
-      MOBILE_NETWORK_SELECT = 1581;
-
-      // OPEN: Settings > Network & internet > Mobile network > Mobile Data > Dialog
-      MOBILE_DATA_DIALOG = 1582;
-
-      // OPEN: Settings > Network & internet > Mobile network > Data roaming > Dialog
-      MOBILE_ROAMING_DIALOG = 1583;
-
-      // Settings > Display > Lock screen display > On lock screen
-      LOCK_SCREEN_NOTIFICATION_CONTENT = 1584;
-    }
-
-    /**
      * Where this SettingsUIChange event comes from. For example, if
      * it's a PAGE_VISIBLE event, where the page is opened from.
      */
-    optional PageId attribution = 1;
+    optional android.app.settings.PageId attribution = 1;
 
     /**
      * What the UI action is.
      */
-    optional Action action = 2;
+    optional android.app.settings.Action action = 2;
 
     /**
      * Where the action is happening
      */
-    optional PageId pageId = 3;
+    optional android.app.settings.PageId pageId = 3;
 
     /**
      * What preference changed in this event.
diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto
new file mode 100644
index 000000000000..2797550a1ab2
--- /dev/null
+++ b/core/proto/android/app/settings_enums.proto
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package android.app.settings;
+option java_multiple_files = true;
+
+/**
+ * The action performed in this event
+ */
+enum Action {
+    ACTION_UNKNOWN = 0;
+    PAGE_VISIBLE = 1;
+    PAGE_HIDE = 2;
+    PREF_CHANGE = 3;
+}
+
+/**
+ * Id for Settings pages. Each page must have its own unique Id.
+ */
+enum PageId {
+  // Unknown page. Should not be used in production code.
+  PAGE_UNKNOWN = 0;
+
+  // OPEN: Settings homepage
+  SETTINGS_HOMEPAGE = 1502;
+
+  // OPEN: Settings > System > Input & Gesture > Wake screen
+  SETTINGS_GESTURE_WAKE_SCREEN = 1570;
+
+  // OPEN: Settings > Network & internet > Mobile network
+  MOBILE_NETWORK = 1571;
+
+  // OPEN: Settings > Network & internet > Mobile network > Choose network
+  MOBILE_NETWORK_SELECT = 1581;
+
+  // OPEN: Settings > Network & internet > Mobile network > Mobile Data > Dialog
+  MOBILE_DATA_DIALOG = 1582;
+
+  // OPEN: Settings > Network & internet > Mobile network > Data roaming > Dialog
+  MOBILE_ROAMING_DIALOG = 1583;
+
+  // Settings > Display > Lock screen display > On lock screen
+  LOCK_SCREEN_NOTIFICATION_CONTENT = 1584;
+}
+