Merge "Share ExtendedWallpaper Flag between SystemUI & Customization Picker" into main (1a1e4f5c) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -1696,13 +1696,6 @@ flag {
		}
		}

		flag {
		name: "magic_portrait_wallpapers"
		namespace: "systemui"
		description: "Magic Portrait related changes in systemui"
		bug: "370863642"
		}

		flag {
		name: "notes_role_qs_tile"
		namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/wallpapers/data/repository/WallpaperRepositoryImplTest.kt

+18 −20

Original line number	Diff line number	Diff line
		@@ -25,16 +25,15 @@ import android.platform.test.annotations.EnableFlags
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.internal.R
		import com.android.systemui.Flags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.keyguard.data.repository.FakeKeyguardClockRepository
		import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository
		import com.android.systemui.res.R as SysUIR
		import com.android.systemui.shared.Flags as SharedFlags
		import com.android.systemui.user.data.model.SelectedUserModel
		import com.android.systemui.user.data.model.SelectionStatus
		import com.android.systemui.user.data.repository.FakeUserRepository
		import com.android.systemui.wallpapers.data.repository.WallpaperRepositoryImpl.Companion.MAGIC_PORTRAIT_CLASSNAME
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.ExperimentalCoroutinesApi
		import kotlinx.coroutines.test.StandardTestDispatcher
		@@ -72,9 +71,12 @@ class WallpaperRepositoryImplTest : SysuiTestCase() {
		)
		}

		lateinit var focalAreaTarget: String

		@Before
		fun setUp() {
		whenever(wallpaperManager.isWallpaperSupported).thenReturn(true)
		focalAreaTarget = context.resources.getString(SysUIR.string.focal_area_target)
		}

		@Test
		@@ -248,17 +250,17 @@ class WallpaperRepositoryImplTest : SysuiTestCase() {
		}

		@Test
		@EnableFlags(Flags.FLAG_MAGIC_PORTRAIT_WALLPAPERS)
		fun shouldSendNotificationLayout_setMagicPortraitWallpaper_launchSendLayoutJob() =
		@EnableFlags(SharedFlags.FLAG_EXTENDED_WALLPAPER_EFFECTS)
		fun shouldSendNotificationLayout_setExtendedEffectsWallpaper_launchSendLayoutJob() =
		testScope.runTest {
		val latest by collectLastValue(underTest.shouldSendFocalArea)
		val magicPortraitWallpaper =
		val extedendEffectsWallpaper =
		mock<WallpaperInfo>().apply {
		whenever(this.component)
		.thenReturn(ComponentName(context, MAGIC_PORTRAIT_CLASSNAME))
		whenever(this.component).thenReturn(ComponentName(context, focalAreaTarget))
		}

		whenever(wallpaperManager.getWallpaperInfoForUser(any()))
		.thenReturn(magicPortraitWallpaper)
		.thenReturn(extedendEffectsWallpaper)
		fakeBroadcastDispatcher.sendIntentToMatchingReceiversOnly(
		context,
		Intent(Intent.ACTION_WALLPAPER_CHANGED),
		@@ -269,13 +271,16 @@ class WallpaperRepositoryImplTest : SysuiTestCase() {
		}

		@Test
		@EnableFlags(Flags.FLAG_MAGIC_PORTRAIT_WALLPAPERS)
		fun shouldSendNotificationLayout_setNotMagicPortraitWallpaper_cancelSendLayoutJob() =
		@EnableFlags(SharedFlags.FLAG_EXTENDED_WALLPAPER_EFFECTS)
		fun shouldSendNotificationLayout_setNotExtendedEffectsWallpaper_cancelSendLayoutJob() =
		testScope.runTest {
		val latest by collectLastValue(underTest.shouldSendFocalArea)
		val magicPortraitWallpaper = MAGIC_PORTRAIT_WP
		val extendedEffectsWallpaper =
		mock<WallpaperInfo>().apply {
		whenever(this.component).thenReturn(ComponentName("", focalAreaTarget))
		}
		whenever(wallpaperManager.getWallpaperInfoForUser(any()))
		.thenReturn(magicPortraitWallpaper)
		.thenReturn(extendedEffectsWallpaper)
		fakeBroadcastDispatcher.sendIntentToMatchingReceiversOnly(
		context,
		Intent(Intent.ACTION_WALLPAPER_CHANGED),
		@@ -284,9 +289,7 @@ class WallpaperRepositoryImplTest : SysuiTestCase() {
		assertThat(underTest.sendLockscreenLayoutJob).isNotNull()
		assertThat(underTest.sendLockscreenLayoutJob!!.isActive).isEqualTo(true)

		val nonMagicPortraitWallpaper = UNSUPPORTED_WP
		whenever(wallpaperManager.getWallpaperInfoForUser(any()))
		.thenReturn(nonMagicPortraitWallpaper)
		whenever(wallpaperManager.getWallpaperInfoForUser(any())).thenReturn(UNSUPPORTED_WP)
		fakeBroadcastDispatcher.sendIntentToMatchingReceiversOnly(
		context,
		Intent(Intent.ACTION_WALLPAPER_CHANGED),
		@@ -303,10 +306,5 @@ class WallpaperRepositoryImplTest : SysuiTestCase() {
		val USER_WITH_SUPPORTED_WP = UserInfo(/* id= / 4, / name= / "user4", / flags= */ 0)
		val SUPPORTED_WP =
		mock<WallpaperInfo>().apply { whenever(this.supportsAmbientMode()).thenReturn(true) }

		val MAGIC_PORTRAIT_WP =
		mock<WallpaperInfo>().apply {
		whenever(this.component).thenReturn(ComponentName("", MAGIC_PORTRAIT_CLASSNAME))
		}
		}
		}

packages/SystemUI/res/values-xlarge-land/config.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,5 +16,5 @@

		<resources>
		<item name="shortcut_helper_screen_width_fraction" format="float" type="dimen">0.8</item>
		<bool name="center_align_magic_portrait_shape">true</bool>
		<bool name="center_align_focal_area_shape">true</bool>
		</resources>

packages/SystemUI/res/values/config.xml

+3 −3

Original line number	Diff line number	Diff line
		@@ -1107,7 +1107,7 @@
		<!-- The dream component used when the device is low light environment. -->
		<string translatable="false" name="config_lowLightDreamComponent"/>

		<!--Whether we should position magic portrait shape effects in the center of lockscreen
		it's false by default, and only be true in tablet landscape -->
		<bool name="center_align_magic_portrait_shape">false</bool>
		<!-- Configuration for wallpaper focal area -->
		<bool name="center_align_focal_area_shape">false</bool>
		<string name="focal_area_target" translatable="false" />
		</resources>

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt

+1 −4

Original line number	Diff line number	Diff line
		@@ -326,10 +326,7 @@ interface KeyguardRepository {

		fun setShortcutAbsoluteTop(top: Float)

		/**
		* Set bottom of notifications from notification stack, and Magic Portrait will layout base on
		* this value
		*/
		/** Set bottom of notifications from notification stack */
		fun setNotificationStackAbsoluteBottom(bottom: Float)

		fun setWallpaperFocalAreaBounds(bounds: RectF)