commit a7aeb86ec8ac062a08707a6de37b185497157991
author Yiyi Shen <yiyishen@google.com> Mon Aug 28 08:03:52 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 28 08:03:52 2023 +0000
tree 483613c106b8e6396e96dfa7b1aa47161bfef1e9
parent 84c4ec936a532445024cd56ed6ae4b7d329a155f
parent 14c611a37c57a5828540df5a52c5dda4f0ed5d9f

Merge "Add flag for Subsequent pair Settings integration" into main

Android.bp

diff --git a/Android.bp b/Android.bp
index bb5ace8..e27b9a1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -107,6 +107,7 @@
         "Settings-change-ids",
         "androidx.room_room-runtime",
         "SystemUIUnfoldLib",
+        "aconfig_settings_flags_lib",
     ],
 
     plugins: [

aconfig/Android.bp

diff --git a/aconfig/Android.bp b/aconfig/Android.bp
new file mode 100644
index 0000000..96a2f41
--- /dev/null
+++ b/aconfig/Android.bp
@@ -0,0 +1,17 @@
+package {
+    default_applicable_licenses: ["packages_apps_Settings_license"],
+}
+
+aconfig_declarations {
+    name: "aconfig_settings_connecteddevice_flags",
+    package: "com.android.settings.connecteddevice.flags",
+    srcs: [
+        "settings_connecteddevice_flag_declarations.aconfig",
+    ],
+}
+
+java_aconfig_library {
+    name: "aconfig_settings_flags_lib",
+    aconfig_declarations: "aconfig_settings_connecteddevice_flags",
+}
+

aconfig/settings_connecteddevice_flag_declarations.aconfig

diff --git a/aconfig/settings_connecteddevice_flag_declarations.aconfig b/aconfig/settings_connecteddevice_flag_declarations.aconfig
new file mode 100644
index 0000000..edeb35a
--- /dev/null
+++ b/aconfig/settings_connecteddevice_flag_declarations.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.settings.connecteddevice.flags"
+
+flag {
+  name: "enable_subsequent_pair_settings_integration"
+  namespace: "pixel_cross_device_control"
+  description: "Gates whether to enable subsequent pair Settings integration."
+  bug: "296507968"
+}