Merge "Add glanceable hub to large-screen lockscreen shortcut default behind flag" into main (d016ce92) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,9 @@ android_library {
		"androidx.slice_slice-view",
		],
		manifest: "AndroidManifest-res.xml",
		flags_packages: [
		"com_android_systemui_flags",
		],
		}

		android_library {

+8 −0

Original line number	Diff line number	Diff line
		@@ -1228,6 +1228,14 @@ flag {
		bug: "375689917"
		}

		flag {
		name: "glanceable_hub_v2_resources"
		namespace: "systemui"
		description: "Read only flag for rolling out glanceable hub v2 resource values"
		bug: "375689917"
		is_fixed_read_only: true
		}

		flag {
		name: "dream_overlay_updated_font"
		namespace: "systemui"

+4 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@

		<!-- These resources are around just to allow their values to be customized
		for different hardware and product builds. -->
		<resources>
		<resources xmlns:android="http://schemas.android.com/apk/res/android">
		<!-- The maximum number of rows in the QuickSettings -->
		<integer name="quick_settings_max_rows">4</integer>

		@@ -51,7 +51,9 @@
		ignored. -->
		<string-array name="config_keyguardQuickAffordanceDefaults" translatable="false">
		<item>bottom_start:home</item>
		<item>bottom_end:create_note</item>
		<!-- TODO(b/384119565): revisit decision on defaults -->
		<item android:featureFlag="!com.android.systemui.glanceable_hub_v2_resources">bottom_end:create_note</item>
		<item android:featureFlag="com.android.systemui.glanceable_hub_v2_resources">bottom_end:glanceable_hub</item>
		</string-array>

		<!-- Whether volume panel should use the large screen layout or not -->