Merge "Implement Clock Size Switch Animation" into main (67b4e66c) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/elements/LockscreenUpperRegionElementProvider.kt

+223 −120

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
		import androidx.compose.foundation.layout.fillMaxWidth
		import androidx.compose.foundation.layout.padding
		import androidx.compose.runtime.Composable
		import androidx.compose.runtime.remember
		import androidx.compose.ui.Modifier
		import androidx.compose.ui.graphics.graphicsLayer
		import androidx.compose.ui.res.dimensionResource
		@@ -34,6 +35,8 @@ import androidx.window.core.layout.WindowSizeClass
		import com.android.compose.animation.Easings
		import com.android.compose.animation.scene.ContentScope
		import com.android.compose.animation.scene.ElementContentScope
		import com.android.compose.animation.scene.PropertyTransformationBuilder
		import com.android.compose.animation.scene.TransitionBuilder
		import com.android.compose.windowsizeclass.LocalWindowSizeClass
		import com.android.systemui.keyguard.shared.model.ClockSize
		import com.android.systemui.keyguard.ui.viewmodel.LockscreenUpperRegionViewModel
		@@ -42,13 +45,14 @@ import com.android.systemui.log.LogBuffer
		import com.android.systemui.log.core.Logger
		import com.android.systemui.log.dagger.KeyguardBlueprintLog
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElement
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.Clock
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.MediaCarousel
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.Notifications
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.Region
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementKeys.Smartspace
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenElementProvider
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenSceneKeys.CenteredClockScene
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenSceneKeys.TwoColumnScene
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenSceneKeys.UpperRegion.NarrowLayout as NarrowScenes
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenSceneKeys.UpperRegion.WideLayout as WideScenes
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenScope
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenScope.Companion.LockscreenElement
		import com.android.systemui.plugins.keyguard.ui.composable.elements.LockscreenScope.Companion.NestedScenes
		@@ -69,54 +73,121 @@ constructor(
		private val logger = Logger(blueprintLog, "LockscreenUpperRegionElementProvider")
		override val elements: List<LockscreenElement> by lazy { listOf(UpperRegionElement()) }

		private val wideLayout = WideLayout()
		private val narrowLayout = NarrowLayout()

		private inner class UpperRegionElement : LockscreenElement {
		override val key = LockscreenElementKeys.Region.Upper
		override val key = Region.Upper
		override val context = this@LockscreenUpperRegionElementProvider.context

		@Composable
		override fun LockscreenScope<ElementContentScope>.LockscreenElement() {
		val viewModel = rememberViewModel("LockscreenUpperRegion") { viewModelFactory.create() }
		when (getLayoutType()) {
		LayoutType.WIDE -> with(wideLayout) { Layout(viewModel) }
		LayoutType.NARROW -> with(narrowLayout) { Layout(viewModel) }
		val layoutType = getLayoutType()
		val layout =
		remember(viewModel, layoutType) {
		when (layoutType) {
		LayoutType.WIDE -> WideLayout(viewModel)
		LayoutType.NARROW -> NarrowLayout(viewModel)
		}
		}

		with(layout) { Layout() }
		}
		}

		/** The Narrow Layouts are intended for phones */
		private inner class NarrowLayout {
		abstract inner class RegionLayout(val viewModel: LockscreenUpperRegionViewModel) {
		@Composable abstract fun LockscreenScope<ContentScope>.Layout(modifier: Modifier = Modifier)

		@Composable
		fun LockscreenScope<ContentScope>.Layout(
		viewModel: LockscreenUpperRegionViewModel,
		modifier: Modifier = Modifier,
		) {
		when (viewModel.clockSize) {
		ClockSize.LARGE -> LargeClock(viewModel, modifier)
		ClockSize.SMALL -> Content(viewModel, modifier)
		protected fun LockscreenScope<ContentScope>.Notifications(modifier: Modifier = Modifier) {
		Column(modifier = modifier.fillMaxHeight()) {
		AODNotifications()
		AnimatedVisibility(viewModel.isNotificationStackActive) {
		LockscreenElement(Notifications.Stack)
		}
		}
		}

		@Composable
		private fun LockscreenScope<ContentScope>.LargeClock(
		viewModel: LockscreenUpperRegionViewModel,
		modifier: Modifier = Modifier,
		protected fun LockscreenScope<ContentScope>.AODNotifications(
		modifier: Modifier = Modifier
		) {
		AnimatedVisibility(viewModel.isDozing, modifier) {
		if (PromotedNotificationUi.isEnabled) {
		LockscreenElement(Notifications.AOD.Promoted)
		}
		LockscreenElement(Notifications.AOD.IconShelf)
		}
		}

		protected fun TransitionBuilder.configureClockTransition(
		enter: PropertyTransformationBuilder.() -> Unit,
		exit: PropertyTransformationBuilder.() -> Unit,
		) {
		LockscreenElement(Region.Clock.Large, modifier)
		spec = tween(300, easing = Easings.Emphasized)

		// Since Smartspace cards are guaranteed to be shared between the small and large clock
		// regions, it's convenient to anchor the movement of the small clock elements to it.
		anchoredTranslate(Clock.Small, anchor = Smartspace.Cards)
		anchoredTranslate(Smartspace.DWA.SmallClock.Row, anchor = Smartspace.Cards)
		anchoredTranslate(Smartspace.DWA.SmallClock.Column, anchor = Smartspace.Cards)

		timestampRange(endMillis = 133) { exit() }
		timestampRange(startMillis = 133, endMillis = 300) { enter() }
		}

		protected fun PropertyTransformationBuilder.fadeLargeClock() {
		fade(Clock.Large)
		fade(Smartspace.DWA.LargeClock.Above)
		fade(Smartspace.DWA.LargeClock.Below)
		}

		protected fun PropertyTransformationBuilder.fadeSmallClock() {
		fade(Clock.Small)
		fade(Smartspace.DWA.SmallClock.Row)
		fade(Smartspace.DWA.SmallClock.Column)
		}
		}

		/** The Narrow Layouts are intended for phones */
		inner class NarrowLayout(viewModel: LockscreenUpperRegionViewModel) : RegionLayout(viewModel) {
		@Composable
		private fun LockscreenScope<ContentScope>.Content(
		viewModel: LockscreenUpperRegionViewModel,
		modifier: Modifier = Modifier,
		override fun LockscreenScope<ContentScope>.Layout(modifier: Modifier) {
		val clockSize =
		viewModel.evaluateClockSize {
		when {
		viewModel.isNotificationStackActive -> ClockSize.SMALL
		viewModel.isMediaActive -> ClockSize.SMALL
		else -> ClockSize.LARGE
		}
		}

		NestedScenes(
		sceneKey =
		when (clockSize) {
		ClockSize.LARGE -> NarrowScenes.LargeClock
		ClockSize.SMALL -> NarrowScenes.SmallClock
		},
		transitions = {
		from(from = NarrowScenes.SmallClock, to = NarrowScenes.LargeClock) {
		configureClockTransition(
		enter = { fadeLargeClock() },
		exit = { fadeSmallClock() },
		)
		}
		from(from = NarrowScenes.LargeClock, to = NarrowScenes.SmallClock) {
		configureClockTransition(
		enter = { fadeSmallClock() },
		exit = { fadeLargeClock() },
		)
		}
		},
		modifier = modifier,
		) {
		Column(modifier = modifier) {
		scene(NarrowScenes.LargeClock) { LockscreenElement(Region.Clock.Large) }
		scene(NarrowScenes.SmallClock) {
		Column {
		LockscreenElement(Region.Clock.Small)
		LockscreenElement(
		MediaCarousel,
		modifier =
		Modifier.padding(
		bottom =
		dimensionResource(
		@@ -124,98 +195,126 @@ constructor(
		)
		),
		)
		Notifications(viewModel)
		Notifications()
		}
		}
		}
		}
		}

		/** The wide layouts are intended for tablets / foldables */
		private inner class WideLayout {
		inner class WideLayout(viewModel: LockscreenUpperRegionViewModel) : RegionLayout(viewModel) {
		@Composable
		fun LockscreenScope<ContentScope>.Layout(
		viewModel: LockscreenUpperRegionViewModel,
		modifier: Modifier = Modifier,
		) {
		// TODO(b/441339360): Align w/ pre-flexi logic
		override fun LockscreenScope<ContentScope>.Layout(modifier: Modifier) {
		val clockSize =
		viewModel.evaluateClockSize {
		when {
		viewModel.shadeMode == ShadeMode.Dual -> ClockSize.LARGE
		viewModel.isMediaActive -> ClockSize.SMALL
		else -> ClockSize.LARGE
		}
		}

		val isTwoColumn =
		when {
		viewModel.clockSize == ClockSize.SMALL -> true
		viewModel.isOnAOD -> false
		viewModel.isNotificationsVisible -> true
		viewModel.isMediaVisible -> true
		clockSize == ClockSize.SMALL -> true
		!viewModel.isDozing && viewModel.isNotificationStackActive -> true
		viewModel.isDozing && viewModel.isHeadsUpNotificationActive -> true
		viewModel.isDozing && viewModel.isPromotedNotificationActive -> true
		else -> false
		}

		NestedScenes(
		sceneKey = if (isTwoColumn) TwoColumnScene else CenteredClockScene,
		sceneKey =
		when {
		!isTwoColumn -> WideScenes.CenteredClock
		clockSize == ClockSize.LARGE -> WideScenes.TwoColumn.LargeClock
		else -> WideScenes.TwoColumn.SmallClock
		},
		transitions = {
		from(from = CenteredClockScene, to = TwoColumnScene) {
		from(from = WideScenes.CenteredClock, to = WideScenes.TwoColumn.LargeClock) {
		spec = tween(ClockCenteringDurationMS, easing = Easings.Emphasized)
		}
		from(from = TwoColumnScene, to = CenteredClockScene) {
		from(from = WideScenes.TwoColumn.LargeClock, to = WideScenes.CenteredClock) {
		spec = tween(ClockCenteringDurationMS, easing = Easings.Emphasized)
		}
		from(from = WideScenes.CenteredClock, to = WideScenes.TwoColumn.SmallClock) {
		configureClockTransition(
		enter = { fadeSmallClock() },
		exit = { fadeLargeClock() },
		)
		}
		from(from = WideScenes.TwoColumn.SmallClock, to = WideScenes.CenteredClock) {
		configureClockTransition(
		enter = { fadeLargeClock() },
		exit = { fadeSmallClock() },
		)
		}
		from(
		from = WideScenes.TwoColumn.LargeClock,
		to = WideScenes.TwoColumn.SmallClock,
		) {
		configureClockTransition(
		enter = { fadeSmallClock() },
		exit = { fadeLargeClock() },
		)
		}
		from(
		from = WideScenes.TwoColumn.SmallClock,
		to = WideScenes.TwoColumn.LargeClock,
		) {
		configureClockTransition(
		enter = { fadeLargeClock() },
		exit = { fadeSmallClock() },
		)
		}
		},
		modifier = modifier,
		) {
		scene(CenteredClockScene) { LargeClockCentered(viewModel) }
		scene(TwoColumnScene) {
		scene(WideScenes.CenteredClock) { LockscreenElement(Region.Clock.Large) }
		scene(WideScenes.TwoColumn.LargeClock) {
		when (viewModel.shadeMode) {
		ShadeMode.Dual -> TwoColumnNotifStart(viewModel)
		ShadeMode.Split -> TwoColumnNotifEnd(viewModel)
		ShadeMode.Dual -> NotificationsStartLargeClock()
		ShadeMode.Split -> NotificationsEndLargeClock()
		else -> logger.wtf("WideLayout state is invalid")
		}
		}
		scene(WideScenes.TwoColumn.SmallClock) {
		when (viewModel.shadeMode) {
		ShadeMode.Dual -> NotificationsStartSmallClock()
		ShadeMode.Split -> NotificationsEndSmallClock()
		else -> logger.wtf("WideLayout state is invalid")
		}
		}
		}

		@Composable
		private fun LockscreenScope<ContentScope>.LargeClockCentered(
		viewModel: LockscreenUpperRegionViewModel,
		modifier: Modifier = Modifier,
		) {
		LockscreenElement(Region.Clock.Large, modifier)
		}

		@Composable
		private fun LockscreenScope<ContentScope>.TwoColumnNotifEnd(
		viewModel: LockscreenUpperRegionViewModel,
		modifier: Modifier = Modifier,
		private fun LockscreenScope<ContentScope>.NotificationsStartLargeClock(
		modifier: Modifier = Modifier
		) {
		TwoColumn(
		viewModel = viewModel,
		modifier = modifier,
		startContent = {
		Column {
		if (viewModel.clockSize == ClockSize.SMALL) {
		LockscreenElement(Region.Clock.Small)
		}
		LockscreenElement(MediaCarousel)
		}
		if (viewModel.clockSize == ClockSize.LARGE) {
		LockscreenElement(Region.Clock.Large)
		Notifications()
		}
		},
		endContent = { Notifications(viewModel) },
		endContent = { LockscreenElement(Region.Clock.Large) },
		modifier = modifier,
		)
		}

		@Composable
		private fun LockscreenScope<ContentScope>.TwoColumnNotifStart(
		viewModel: LockscreenUpperRegionViewModel,
		modifier: Modifier = Modifier,
		private fun LockscreenScope<ContentScope>.NotificationsStartSmallClock(
		modifier: Modifier = Modifier
		) {
		TwoColumn(
		viewModel = viewModel,
		modifier = modifier,
		startContent = {
		Column {
		if (viewModel.clockSize == ClockSize.SMALL) {
		LockscreenElement(Region.Clock.Small)
		}
		LockscreenElement(
		MediaCarousel,
		modifier =
		Modifier.padding(
		bottom =
		dimensionResource(
		@@ -223,25 +322,47 @@ constructor(
		)
		),
		)
		Notifications(viewModel)
		Notifications()
		}
		},
		endContent = {
		if (viewModel.clockSize == ClockSize.LARGE) {
		LockscreenElement(Region.Clock.Large)
		modifier = modifier,
		)
		}

		@Composable
		private fun LockscreenScope<ContentScope>.NotificationsEndLargeClock(
		modifier: Modifier = Modifier
		) {
		TwoColumn(
		startContent = { LockscreenElement(Region.Clock.Large) },
		endContent = { Notifications() },
		modifier = modifier,
		)
		}

		@Composable
		private fun LockscreenScope<ContentScope>.NotificationsEndSmallClock(
		modifier: Modifier = Modifier
		) {
		TwoColumn(
		startContent = {
		Column {
		LockscreenElement(Region.Clock.Small)
		LockscreenElement(MediaCarousel)
		}
		},
		endContent = { Notifications() },
		modifier = modifier,
		)
		}

		@Composable
		private fun TwoColumn(
		viewModel: LockscreenUpperRegionViewModel,
		startContent: @Composable BoxScope.() -> Unit,
		endContent: @Composable BoxScope.() -> Unit,
		modifier: Modifier = Modifier,
		startContent: @Composable BoxScope.() -> Unit = {},
		endContent: @Composable BoxScope.() -> Unit = {},
		) {
		Row(modifier = modifier) {
		Row(modifier) {
		Box(
		content = startContent,
		modifier =
		@@ -260,26 +381,8 @@ constructor(
		}
		}

		@Composable
		private fun LockscreenScope<ContentScope>.Notifications(
		viewModel: LockscreenUpperRegionViewModel,
		modifier: Modifier = Modifier,
		) {
		AnimatedVisibility(viewModel.isNotificationsVisible) {
		Box(modifier = modifier.fillMaxHeight()) {
		Column {
		if (PromotedNotificationUi.isEnabled) {
		LockscreenElement(Notifications.AOD.Promoted)
		}
		LockscreenElement(Notifications.AOD.IconShelf)
		}
		LockscreenElement(Notifications.Stack)
		}
		}
		}

		companion object {
		val ClockCenteringDurationMS = 1000
		const val ClockCenteringDurationMS = 1000

		enum class LayoutType {
		WIDE,

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/elements/MediaElementProvider.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ constructor(
		val viewModel =
		rememberViewModel("MediaCarouselElement") { mediaViewModelFactory.create() }

		AnimatedVisibility(viewModel.isMediaVisible) {
		AnimatedVisibility(viewModel.isMediaActive && !viewModel.isDozing) {
		Element(
		key = Media.Elements.mediaCarousel,
		modifier = Modifier.fillMaxWidth().padding(horizontal = horizontalPadding),

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardMediaViewModelTest.kt

deleted100644 → 0

+0 −84

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.keyguard.ui.viewmodel

		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.keyguard.data.repository.keyguardRepository
		import com.android.systemui.kosmos.runTest
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.kosmos.useUnconfinedTestDispatcher
		import com.android.systemui.lifecycle.activateIn
		import com.android.systemui.media.controls.shared.model.MediaData
		import com.android.systemui.media.remedia.data.repository.mediaPipelineRepository
		import com.android.systemui.testKosmos
		import com.google.common.truth.Truth.assertThat
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class KeyguardMediaViewModelTest : SysuiTestCase() {
		private val kosmos = testKosmos().useUnconfinedTestDispatcher()

		private val underTest = kosmos.keyguardMediaViewModelFactory.create()

		@Before
		fun setUp() {
		underTest.activateIn(kosmos.testScope)
		}

		@Test
		fun onDozing_noActiveMedia_mediaIsHidden() =
		kosmos.runTest {
		keyguardRepository.setIsDozing(true)

		assertThat(underTest.isMediaVisible).isFalse()
		}

		@Test
		fun onDozing_activeMediaExists_mediaIsHidden() =
		kosmos.runTest {
		val userMedia = MediaData(active = true)

		mediaPipelineRepository.addCurrentUserMediaEntry(userMedia)
		keyguardRepository.setIsDozing(true)

		assertThat(underTest.isMediaVisible).isFalse()
		}

		@Test
		fun onDeviceAwake_activeMediaExists_mediaIsVisible() =
		kosmos.runTest {
		val userMedia = MediaData(active = true)

		mediaPipelineRepository.addCurrentUserMediaEntry(userMedia)
		keyguardRepository.setIsDozing(false)

		assertThat(underTest.isMediaVisible).isTrue()
		}

		@Test
		fun onDeviceAwake_noActiveMedia_mediaIsHidden() =
		kosmos.runTest {
		keyguardRepository.setIsDozing(false)

		assertThat(underTest.isMediaVisible).isFalse()
		}
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUpperRegionViewModelTest.kt

+3 −2

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ class LockscreenUpperRegionViewModelTest(flags: FlagsParameterization) : SysuiTe
		fun isNotificationsVisible_hasNotifications_true() =
		kosmos.runTest {
		setupState(hasNotifications = true)
		assertThat(underTest.isNotificationsVisible).isTrue()
		assertThat(underTest.isNotificationStackActive).isTrue()
		}

		@Test
		@@ -97,10 +97,11 @@ class LockscreenUpperRegionViewModelTest(flags: FlagsParameterization) : SysuiTe
		fun isNotificationsVisible_hasNoNotifications_false() =
		kosmos.runTest {
		setupState(hasNotifications = false)
		assertThat(underTest.isNotificationsVisible).isFalse()
		assertThat(underTest.isNotificationStackActive).isFalse()
		}

		@Test
		@EnableSceneContainer
		fun unfoldTranslations() =
		kosmos.runTest {
		val maxTranslation = prepareConfiguration()

packages/SystemUI/plugin/src/com/android/systemui/plugins/keyguard/ui/composable/elements/LockscreenKeys.kt

+28 −7

File changed.

Preview size limit exceeded, changes collapsed.