Merge "Define aconfig flags for settingslib" into main (72d3772c) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Android.bp

+15 −1

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ android_library {
		"SettingsLibTwoTargetPreference",
		"SettingsLibUsageProgressBarPreference",
		"SettingsLibUtils",
		"settingslib_media_flags_lib",
		"settingslib_flags_lib",
		],

		@@ -78,6 +79,19 @@ aconfig_declarations {
		}

		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",
		}

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		package: "com.android.settingslib.flags"

		flag {
		name: "new_status_bar_icons"
		namespace: "systemui"
		description: "Enable new status bar system icons"
		bug: "314812750"
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ android_test {
		"SettingsLibDeviceStateRotationLock",
		"SettingsLibSettingsSpinner",
		"SettingsLibUsageProgressBarPreference",
		"settingslib_flags_lib",
		"settingslib_media_flags_lib",
		],

		dxflags: ["--multi-dex"],

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ android_robolectric_test {
		"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"],