Merge "Update SystemUI aconfig files to match new style" into main (8b9cd666) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+2 −16

Original line number	Diff line number	Diff line
		@@ -132,20 +132,6 @@ android_library {
		manifest: "AndroidManifest-res.xml",
		}

		aconfig_declarations {
		name: "systemui_aconfig_flags",
		package: "com.android.systemui.aconfig",
		srcs: [
		"src/com/android/systemui/aconfig/systemui.aconfig",
		"src/com/android/systemui/accessibility/aconfig/accessibility.aconfig",
		],
		}

		java_aconfig_library {
		name: "systemui_aconfig_flags_lib",
		aconfig_declarations: "systemui_aconfig_flags",
		}

		android_library {
		name: "SystemUI-core",
		defaults: [
		@@ -180,7 +166,7 @@ android_library {
		"SystemUISharedLib",
		"SystemUI-statsd",
		"SettingsLib",
		"systemui_aconfig_flags_lib",
		"com_android_systemui_flags_lib",
		"androidx.core_core-ktx",
		"androidx.viewpager2_viewpager2",
		"androidx.legacy_legacy-support-v4",
		@@ -377,7 +363,7 @@ android_library {
		"SystemUICustomizationLib",
		"SystemUI-statsd",
		"SettingsLib",
		"systemui_aconfig_flags_lib",
		"com_android_systemui_flags_lib",
		"androidx.viewpager2_viewpager2",
		"androidx.legacy_legacy-support-v4",
		"androidx.recyclerview_recyclerview",

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		aconfig_declarations {
		name: "com_android_systemui_flags",
		package: "com.android.systemui",
		srcs: [
		"systemui.aconfig",
		"accessibility.aconfig",
		],
		}

		java_aconfig_library {
		name: "com_android_systemui_flags_lib",
		aconfig_declarations: "com_android_systemui_flags",
		}

+3 −2

Original line number	Diff line number	Diff line
		package: "com.android.systemui.aconfig"
		package: "com.android.systemui"

		flag {
		name: "floating_menu_overlaps_nav_bars_flag"
		namespace: "accessibility"

+2 −2

Original line number	Diff line number	Diff line
		package: "com.android.systemui.aconfig"
		package: "com.android.systemui"

		flag {
		name: "example_flag"

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ import androidx.recyclerview.widget.RecyclerView;
		import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate;

		import com.android.internal.accessibility.dialog.AccessibilityTarget;
		import com.android.systemui.aconfig.Flags;
		import com.android.systemui.Flags;

		import java.util.ArrayList;
		import java.util.Collections;