Define aconfig flags for settingslib
Adds a settingslib.aconfig that is separate from the existing
settlingslib_media_flag_declarations.aconfig file. The existing aconfig
uses a media package and it seemed to make more sense to break out a
shared settlingslib flag file
The new file defines com.settingslib.flags.new_status_bar_icons
Test: compile
Test: settingslib robo tests, settingslib unit tests
Bug: 314812750
Flag: ACONFIG com.settingslib.flags.new_status_bar_icons DEVELOPMENT
Change-Id: I33399555c81acaed314e2b8dc2fed37ef7249050
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp
index b9dc618..2501869 100644
--- a/packages/SettingsLib/Android.bp
+++ b/packages/SettingsLib/Android.bp
@@ -48,6 +48,7 @@
"SettingsLibTwoTargetPreference",
"SettingsLibUsageProgressBarPreference",
"SettingsLibUtils",
+ "settingslib_media_flags_lib",
"settingslib_flags_lib",
],
@@ -78,6 +79,19 @@
}
java_aconfig_library {
- name: "settingslib_flags_lib",
+ name: "settingslib_media_flags_lib",
aconfig_declarations: "settingslib_media_flags",
}
+
+aconfig_declarations {
+ name: "settingslib_flags",
+ package: "com.android.settingslib.flags",
+ srcs: [
+ "aconfig/settingslib.aconfig",
+ ],
+}
+
+java_aconfig_library {
+ name: "settingslib_flags_lib",
+ aconfig_declarations: "settingslib_flags",
+}
diff --git a/packages/SettingsLib/aconfig/settingslib.aconfig b/packages/SettingsLib/aconfig/settingslib.aconfig
new file mode 100644
index 0000000..fd2f9bd
--- /dev/null
+++ b/packages/SettingsLib/aconfig/settingslib.aconfig
@@ -0,0 +1,9 @@
+package: "com.android.settingslib.flags"
+
+flag {
+ name: "new_status_bar_icons"
+ namespace: "systemui"
+ description: "Enable new status bar system icons"
+ bug: "314812750"
+}
+
diff --git a/packages/SettingsLib/tests/integ/Android.bp b/packages/SettingsLib/tests/integ/Android.bp
index 4b4caf5..644b72c 100644
--- a/packages/SettingsLib/tests/integ/Android.bp
+++ b/packages/SettingsLib/tests/integ/Android.bp
@@ -56,7 +56,7 @@
"SettingsLibDeviceStateRotationLock",
"SettingsLibSettingsSpinner",
"SettingsLibUsageProgressBarPreference",
- "settingslib_flags_lib",
+ "settingslib_media_flags_lib",
],
dxflags: ["--multi-dex"],
diff --git a/packages/SettingsLib/tests/robotests/Android.bp b/packages/SettingsLib/tests/robotests/Android.bp
index 732c336..f4ddd0a 100644
--- a/packages/SettingsLib/tests/robotests/Android.bp
+++ b/packages/SettingsLib/tests/robotests/Android.bp
@@ -50,7 +50,7 @@
"androidx.test.core",
"androidx.core_core",
"flag-junit",
- "settingslib_flags_lib",
+ "settingslib_media_flags_lib",
"testng", // TODO: remove once JUnit on Android provides assertThrows
],
java_resource_dirs: ["config"],