Merge "Add LocaleNotificaiton feature flag" into main

aconfig/Android.bp

@@ -7,7 +7,7 @@ aconfig_declarations {
     package: "com.android.settings.flags",
     srcs: [
         "settings_connecteddevice_flag_declarations.aconfig",
-        "settings_localepicker_flag_declarations.aconfig",
+        "settings_globalintl_flag_declarations.aconfig",
     ],
 }
 

aconfig/settings_globalintl_flag_declarations.aconfig

@@ -0,0 +1,15 @@
+package: "com.android.settings.flags"
+
+flag {
+    name: "terms_of_address_enabled"
+    namespace: "settings_globalintl"
+    description: "Feature flag for Terms of Address"
+    bug: "297798866"
+}
+
+flag {
+    name: "locale_notification_enabled"
+    namespace: "settings_globalintl"
+    description: "Feature flag for locale notification"
+    bug: "248514263"
+}

aconfig/settings_localepicker_flag_declarations.aconfig

@@ -1,8 +0,0 @@
-package: "com.android.settings.flags"
-
-flag {
-    name: "terms_of_address_enabled"
-    namespace: "settings_localepicker"
-    description: "Feature flag for Terms of Address"
-    bug: "297798866"
-}