Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fa2bdd9 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge changes I084f06be,I11b3cb18 into main 

* changes:
  Enable smoother burn-in adjustments on transition cancel
  Add reasons from DOZING->GONE
parents 66b4d2f7 c9ce255f

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

+8 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.google.common.truth.Truth.assertThat 
import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.emptyFlow

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Ignore
@@ -107,6 +108,7 @@ class AodBurnInViewModelTest : SysuiTestCase() { 
    fun translationAndScale_whenNotDozing() =

        testScope.runTest {

            val movement by collectLastValue(underTest.movement)

            assertThat(movement?.translationX).isEqualTo(0)



            // Set to not dozing (on lockscreen)

            keyguardTransitionRepository.sendTransitionStep(
@@ -180,6 +182,7 @@ class AodBurnInViewModelTest : SysuiTestCase() { 
        testScope.runTest {

            underTest.updateBurnInParams(burnInParameters.copy(minViewY = 100))

            val movement by collectLastValue(underTest.movement)

            assertThat(movement?.translationX).isEqualTo(0)



            // Set to dozing (on AOD)

            keyguardTransitionRepository.sendTransitionStep(
@@ -221,6 +224,7 @@ class AodBurnInViewModelTest : SysuiTestCase() { 
        testScope.runTest {

            underTest.updateBurnInParams(burnInParameters.copy(minViewY = 100, topInset = 80))

            val movement by collectLastValue(underTest.movement)

            assertThat(movement?.translationX).isEqualTo(0)



            // Set to dozing (on AOD)

            keyguardTransitionRepository.sendTransitionStep(
@@ -263,6 +267,7 @@ class AodBurnInViewModelTest : SysuiTestCase() { 
        testScope.runTest {

            underTest.updateBurnInParams(burnInParameters.copy(minViewY = 100, topInset = 80))

            val movement by collectLastValue(underTest.movement)

            assertThat(movement?.translationX).isEqualTo(0)



            // Set to dozing (on AOD)

            keyguardTransitionRepository.sendTransitionStep(
@@ -305,6 +310,7 @@ class AodBurnInViewModelTest : SysuiTestCase() { 
            whenever(clockController.config.useAlternateSmartspaceAODTransition).thenReturn(true)



            val movement by collectLastValue(underTest.movement)

            assertThat(movement?.translationX).isEqualTo(0)



            // Set to dozing (on AOD)

            keyguardTransitionRepository.sendTransitionStep(
@@ -423,6 +429,7 @@ class AodBurnInViewModelTest : SysuiTestCase() { 
                .thenReturn(if (isWeatherClock) true else false)



            val movement by collectLastValue(underTest.movement)

            assertThat(movement?.translationX).isEqualTo(0)



            // Set to dozing (on AOD)

            keyguardTransitionRepository.sendTransitionStep(
@@ -434,6 +441,7 @@ class AodBurnInViewModelTest : SysuiTestCase() { 
                ),

                validateStep = false,

            )

            runCurrent()



            // Trigger a change to the burn-in model

            burnInFlow.value = BurnInModel(translationX = 20, translationY = 30, scale = 0.5f)

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

+14 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.animation.ValueAnimator 
import android.annotation.SuppressLint

import android.app.DreamManager

import com.android.app.animation.Interpolators

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.systemui.Flags.communalSceneKtfRefactor

import com.android.systemui.communal.domain.interactor.CommunalInteractor

import com.android.systemui.communal.domain.interactor.CommunalSceneInteractor
@@ -41,7 +42,6 @@ import kotlin.time.Duration.Companion.milliseconds 
import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.debounce

import com.android.app.tracing.coroutines.launchTraced as launch



@SysUISingleton

class FromDozingTransitionInteractor
@@ -135,11 +135,22 @@ constructor( 


                    if (!deviceEntryInteractor.isLockscreenEnabled()) {

                        if (!SceneContainerFlag.isEnabled) {

                            startTransitionTo(KeyguardState.GONE)

                            startTransitionTo(

                                KeyguardState.GONE,

                                ownerReason = "lockscreen not enabled",

                            )

                        }

                    } else if (canDismissLockscreen() || isKeyguardGoingAway) {

                        if (!SceneContainerFlag.isEnabled) {

                            startTransitionTo(KeyguardState.GONE)

                            startTransitionTo(

                                KeyguardState.GONE,

                                ownerReason =

                                    if (canDismissLockscreen()) {

                                        "canDismissLockscreen()"

                                    } else {

                                        "isKeyguardGoingAway"

                                    },

                            )

                        }

                    } else if (primaryBouncerShowing) {

                        if (!SceneContainerFlag.isEnabled) {

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

+15 −1
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ 


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



import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.keyguard.logging.KeyguardLogger

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.deviceentry.domain.interactor.DeviceEntryInteractor

import com.android.systemui.keyguard.ui.viewmodel.AodBurnInViewModel

import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel

import com.android.systemui.log.core.LogLevel.VERBOSE
@@ -29,7 +31,6 @@ import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNoti 
import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.debounce

import com.android.app.tracing.coroutines.launchTraced as launch



private val TAG = KeyguardTransitionAuditLogger::class.simpleName!!
@@ -48,6 +49,7 @@ constructor( 
    private val aodBurnInViewModel: AodBurnInViewModel,

    private val shadeInteractor: ShadeInteractor,

    private val keyguardOcclusionInteractor: KeyguardOcclusionInteractor,

    private val deviceEntryInteractor: DeviceEntryInteractor,

) {



    fun start() {
@@ -83,6 +85,18 @@ constructor( 
            }

        }



        scope.launch {

            deviceEntryInteractor.isUnlocked.collect {

                logger.log(TAG, VERBOSE, "DeviceEntry isUnlocked", it)

            }

        }



        scope.launch {

            deviceEntryInteractor.isLockscreenEnabled.collect {

                logger.log(TAG, VERBOSE, "DeviceEntry isLockscreenEnabled", it)

            }

        }



        scope.launch {

            keyguardInteractor.primaryBouncerShowing.collect {

                logger.log(TAG, VERBOSE, "Primary bouncer showing", it)

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

+11 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.keyguard.domain.interactor 


import android.animation.ValueAnimator

import android.util.Log

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.systemui.keyguard.KeyguardWmStateRefactor

import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepository

import com.android.systemui.keyguard.shared.model.KeyguardState
@@ -33,7 +34,6 @@ import kotlinx.coroutines.CoroutineScope 
import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.filter

import kotlinx.coroutines.flow.map

import com.android.app.tracing.coroutines.launchTraced as launch



/**

 * Each TransitionInteractor is responsible for determining under which conditions to notify
@@ -201,9 +201,18 @@ sealed class TransitionInteractor( 
            scope.launch {

                keyguardInteractor.onCameraLaunchDetected.filterRelevantKeyguardState().collect {

                    if (!maybeHandleInsecurePowerGesture()) {

                        val lastStep = transitionInteractor.transitionState.value

                        val modeOnCanceled =

                            if (lastStep.to == KeyguardState.AOD) {

                                // Enabled smooth transition when double-tap camera cancels

                                // transition to AOD

                                TransitionModeOnCanceled.REVERSE

                            } else {

                                TransitionModeOnCanceled.RESET

                            }

                        startTransitionTo(

                            toState = KeyguardState.OCCLUDED,

                            modeOnCanceled = TransitionModeOnCanceled.RESET,

                            modeOnCanceled = modeOnCanceled,

                            ownerReason = "keyguardInteractor.onCameraLaunchDetected",

                        )

                    }

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

+14 −3
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor 
import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor

import com.android.systemui.keyguard.shared.model.BurnInModel

import com.android.systemui.keyguard.shared.model.ClockSize

import com.android.systemui.keyguard.shared.model.Edge

import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.keyguard.ui.StateToValue

import com.android.systemui.res.R
@@ -42,8 +43,10 @@ import kotlinx.coroutines.flow.MutableStateFlow 
import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.combine

import kotlinx.coroutines.flow.filter

import kotlinx.coroutines.flow.flatMapLatest

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.merge

import kotlinx.coroutines.flow.onStart

import kotlinx.coroutines.flow.stateIn
@@ -164,9 +167,17 @@ constructor( 


    private fun burnIn(params: BurnInParameters): Flow<BurnInModel> {

        return combine(

            keyguardTransitionInteractor.transitionValue(KeyguardState.AOD).map {

                Interpolators.FAST_OUT_SLOW_IN.getInterpolation(it)

            },

            merge(

                    keyguardTransitionInteractor.transition(Edge.create(to = KeyguardState.AOD)),

                    keyguardTransitionInteractor

                        .transition(Edge.create(from = KeyguardState.AOD))

                        .map { it.copy(value = 1f - it.value) },

                    keyguardTransitionInteractor

                        .transition(Edge.create(to = KeyguardState.LOCKSCREEN))

                        .filter { it.from != KeyguardState.AOD }

                        .map { it.copy(value = 0f) },

                )

                .map { Interpolators.FAST_OUT_SLOW_IN.getInterpolation(it.value) },

            burnInInteractor.burnIn(

                xDimenResourceId = R.dimen.burn_in_prevention_offset_x,

                yDimenResourceId = R.dimen.burn_in_prevention_offset_y,