Merge "Flag removal:... (b307eaf5) · Commits · e / os / android_frameworks_base

packages/SettingsLib/SelectorWithWidgetPreference/Android.bp

+0 −24

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ android_library {
		static_libs: [
		"androidx.preference_preference",
		"SettingsLibSettingsTheme",
		"settingslib_selectorwithwidgetpreference_flags_lib",
		],

		sdk_version: "system_current",
		@@ -32,26 +31,3 @@ android_library {
		"com.android.healthfitness",
		],
		}

		aconfig_declarations {
		name: "settingslib_selectorwithwidgetpreference_flags",
		package: "com.android.settingslib.widget.selectorwithwidgetpreference.flags",
		container: "system",
		srcs: [
		"aconfig/selectorwithwidgetpreference.aconfig",
		],
		}

		java_aconfig_library {
		name: "settingslib_selectorwithwidgetpreference_flags_lib",
		aconfig_declarations: "settingslib_selectorwithwidgetpreference_flags",

		min_sdk_version: "30",
		sdk_version: "system_current",
		apex_available: [
		"//apex_available:platform",
		"com.android.permission",
		"com.android.mediaprovider",
		"com.android.healthfitness",
		],
		}

deleted100644 → 0

+0 −13

Original line number	Diff line number	Diff line
		package: "com.android.settingslib.widget.selectorwithwidgetpreference.flags"
		container: "system"

		flag {
		name: "allow_set_title_max_lines"
		namespace: "accessibility"
		description: "Allow changes to the title max lines so it's not always fixed to 2"
		bug: "356726764"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,6 @@ android_robolectric_test {
		"kotlinx_coroutines_test",
		"settingslib_illustrationpreference_flags_lib",
		"settingslib_media_flags_lib",
		"settingslib_selectorwithwidgetpreference_flags_lib",
		"testng", // TODO: remove once JUnit on Android provides assertThrows
		],
		java_resource_dirs: ["config"],