Merge "Update CUJ_SCREEN_OFF_SHOW_AOD to use new clockId source" into main (60787eec) · Commits · e / os / android_frameworks_base

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/BurnInState.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@ private fun rememberBurnInParameters(

		return remember(clock, topInset, topmostTop) {
		BurnInParameters(
		clockControllerProvider = { clock },
		topInset = topInset,
		minViewY = topmostTop,
		)

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

+3 −4

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import androidx.test.filters.SmallTest
		import com.android.systemui.Flags as AConfigFlags
		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.fakeKeyguardTransitionRepository
		import com.android.systemui.keyguard.domain.interactor.BurnInInteractor
		import com.android.systemui.keyguard.domain.interactor.burnInInteractor
		@@ -60,10 +61,7 @@ class AodBurnInViewModelTest : SysuiTestCase() {
		private val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository
		private lateinit var underTest: AodBurnInViewModel

		private var burnInParameters =
		BurnInParameters(
		clockControllerProvider = { clockController },
		)
		private var burnInParameters = BurnInParameters()
		private val burnInFlow = MutableStateFlow(BurnInModel())

		@Before
		@@ -76,6 +74,7 @@ class AodBurnInViewModelTest : SysuiTestCase() {
		whenever(goneToAodTransitionViewModel.enterFromTopTranslationY(anyInt()))
		.thenReturn(emptyFlow())
		kosmos.goneToAodTransitionViewModel = goneToAodTransitionViewModel
		kosmos.fakeKeyguardClockRepository.setCurrentClock(clockController)

		underTest = kosmos.aodBurnInViewModel
		}

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,7 @@ constructor(
		chipbarCoordinator,
		screenOffAnimationController,
		shadeInteractor,
		{ keyguardStatusViewController!!.getClockController() },
		clockInteractor,
		interactionJankMonitor,
		deviceEntryHapticsInteractor,
		vibratorHelper,

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardClockInteractor.kt

+11 −0

Original line number	Diff line number	Diff line
		@@ -17,7 +17,9 @@

		package com.android.systemui.keyguard.domain.interactor

		import android.util.Log
		import com.android.keyguard.ClockEventController
		import com.android.keyguard.KeyguardClockSwitch
		import com.android.keyguard.KeyguardClockSwitch.ClockSize
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.keyguard.data.repository.KeyguardClockRepository
		@@ -54,6 +56,15 @@ constructor(
		keyguardClockRepository.setClockSize(size)
		}

		val renderedClockId: ClockId
		get() {
		return clock?.let { clock -> clock.config.id }
		?: run {
		Log.e(TAG, "No clock is available")
		KeyguardClockSwitch.MISSING_CLOCK_ID
		}
		}

		fun animateFoldToAod(foldFraction: Float) {
		clock?.let { clock ->
		clock.smallClock.animations.fold(foldFraction)

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt

+3 −14

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ import com.android.app.animation.Interpolators
		import com.android.app.tracing.coroutines.launch
		import com.android.internal.jank.InteractionJankMonitor
		import com.android.internal.jank.InteractionJankMonitor.CUJ_SCREEN_OFF_SHOW_AOD
		import com.android.keyguard.KeyguardClockSwitch.MISSING_CLOCK_ID
		import com.android.systemui.Flags.newAodTransition
		import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.common.shared.model.Text
		@@ -47,6 +46,7 @@ import com.android.systemui.deviceentry.shared.DeviceEntryUdfpsRefactor
		import com.android.systemui.keyguard.KeyguardBottomAreaRefactor
		import com.android.systemui.keyguard.KeyguardViewMediator
		import com.android.systemui.keyguard.MigrateClocksToBlueprint
		import com.android.systemui.keyguard.domain.interactor.KeyguardClockInteractor
		import com.android.systemui.keyguard.shared.model.KeyguardState
		import com.android.systemui.keyguard.shared.model.TransitionState
		import com.android.systemui.keyguard.ui.viewmodel.BurnInParameters
		@@ -55,7 +55,6 @@ import com.android.systemui.keyguard.ui.viewmodel.OccludingAppDeviceEntryMessage
		import com.android.systemui.keyguard.ui.viewmodel.ViewStateAccessor
		import com.android.systemui.lifecycle.repeatWhenAttached
		import com.android.systemui.plugins.FalsingManager
		import com.android.systemui.plugins.clocks.ClockController
		import com.android.systemui.res.R
		import com.android.systemui.shade.domain.interactor.ShadeInteractor
		import com.android.systemui.statusbar.CrossFadeHelper
		@@ -69,7 +68,6 @@ import com.android.systemui.util.ui.AnimatedValue
		import com.android.systemui.util.ui.isAnimating
		import com.android.systemui.util.ui.stopAnimating
		import com.android.systemui.util.ui.value
		import javax.inject.Provider
		import kotlin.math.min
		import kotlinx.coroutines.CoroutineDispatcher
		import kotlinx.coroutines.DisposableHandle
		@@ -93,7 +91,7 @@ object KeyguardRootViewBinder {
		chipbarCoordinator: ChipbarCoordinator,
		screenOffAnimationController: ScreenOffAnimationController,
		shadeInteractor: ShadeInteractor,
		clockControllerProvider: Provider<ClockController>?,
		clockInteractor: KeyguardClockInteractor,
		interactionJankMonitor: InteractionJankMonitor?,
		deviceEntryHapticsInteractor: DeviceEntryHapticsInteractor?,
		vibratorHelper: VibratorHelper?,
		@@ -281,14 +279,11 @@ object KeyguardRootViewBinder {
		viewModel.goneToAodTransition.collect {
		when (it.transitionState) {
		TransitionState.STARTED -> {
		val clockId =
		clockControllerProvider?.get()?.config?.id
		?: MISSING_CLOCK_ID
		val clockId = clockInteractor.renderedClockId
		val builder =
		InteractionJankMonitor.Configuration.Builder
		.withView(CUJ_SCREEN_OFF_SHOW_AOD, view)
		.setTag(clockId)

		jankMonitor.begin(builder)
		}
		TransitionState.CANCELED ->
		@@ -345,12 +340,6 @@ object KeyguardRootViewBinder {
		}
		}

		if (!MigrateClocksToBlueprint.isEnabled) {
		burnInParams.update { current ->
		current.copy(clockControllerProvider = clockControllerProvider)
		}
		}

		if (MigrateClocksToBlueprint.isEnabled) {
		burnInParams.update { current ->
		current.copy(translationY = { childViews[burnInLayerId]?.translationY })