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

Commit 6660b3d8 authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Android (Google) Code Review
Browse files

Merge changes I5a7a184b,Ic79f5449 into main 

* changes:
  Set proper Keyguard transition during DREAMING <-> GONE
  Lockscreen to gone while shade expanded was briefly displaying keyguard
parents 5ac36395 a979828e

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

+1 −0
Original line number Diff line number Diff line
@@ -231,5 +231,6 @@ constructor( 
        private val DEFAULT_DURATION = 500.milliseconds

        val TO_GLANCEABLE_HUB_DURATION = 1.seconds

        val TO_LOCKSCREEN_DURATION = 1167.milliseconds

        val TO_GONE_DURATION = DEFAULT_DURATION

    }

}

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

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 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 com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.domain.interactor.FromDreamingTransitionInteractor

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

import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow

import kotlinx.coroutines.flow.Flow

import javax.inject.Inject



@SysUISingleton

class DreamingToGoneTransitionViewModel

@Inject

constructor(

    animationFlow: KeyguardTransitionAnimationFlow,

) {



    private val transitionAnimation =

            animationFlow.setup(

                duration = FromDreamingTransitionInteractor.TO_GONE_DURATION,

                from = KeyguardState.DREAMING,

                to = KeyguardState.GONE,

            )



    /** Lockscreen views alpha */

    val lockscreenAlpha: Flow<Float> = transitionAnimation.immediatelyTransitionTo(0f)



}
 
 No newline at end of file

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

+12 −2
Original line number Diff line number Diff line
@@ -85,10 +85,12 @@ constructor( 
    private val dozingToLockscreenTransitionViewModel: DozingToLockscreenTransitionViewModel,

    private val dozingToOccludedTransitionViewModel: DozingToOccludedTransitionViewModel,

    private val dreamingToLockscreenTransitionViewModel: DreamingToLockscreenTransitionViewModel,

    private val dreamingToGoneTransitionViewModel: DreamingToGoneTransitionViewModel,

    private val glanceableHubToLockscreenTransitionViewModel:

        GlanceableHubToLockscreenTransitionViewModel,

    private val goneToAodTransitionViewModel: GoneToAodTransitionViewModel,

    private val goneToDozingTransitionViewModel: GoneToDozingTransitionViewModel,

    private val goneToDreamingTransitionViewModel: GoneToDreamingTransitionViewModel,

    private val lockscreenToAodTransitionViewModel: LockscreenToAodTransitionViewModel,

    private val lockscreenToDozingTransitionViewModel: LockscreenToDozingTransitionViewModel,

    private val lockscreenToDreamingTransitionViewModel: LockscreenToDreamingTransitionViewModel,
@@ -136,14 +138,20 @@ constructor( 
            }

            .distinctUntilChanged()



    private val lockscreenToGoneTransitionRunning: Flow<Boolean> =

        keyguardTransitionInteractor

            .isInTransitionWhere { from, to -> from == LOCKSCREEN && to == GONE }

            .onStart { emit(false) }



    private val alphaOnShadeExpansion: Flow<Float> =

        combineTransform(

                lockscreenToGoneTransitionRunning,

                isOnLockscreen,

                shadeInteractor.qsExpansion,

                shadeInteractor.shadeExpansion,

            ) { isOnLockscreen, qsExpansion, shadeExpansion ->

            ) { lockscreenToGoneTransitionRunning, isOnLockscreen, qsExpansion, shadeExpansion ->

                // Fade out quickly as the shade expands

                if (isOnLockscreen) {

                if (isOnLockscreen && !lockscreenToGoneTransitionRunning) {

                    val alpha =

                        1f -

                            MathUtils.constrainedMap(
@@ -204,10 +212,12 @@ constructor( 
                        dozingToGoneTransitionViewModel.lockscreenAlpha(viewState),

                        dozingToLockscreenTransitionViewModel.lockscreenAlpha,

                        dozingToOccludedTransitionViewModel.lockscreenAlpha(viewState),

                        dreamingToGoneTransitionViewModel.lockscreenAlpha,

                        dreamingToLockscreenTransitionViewModel.lockscreenAlpha,

                        glanceableHubToLockscreenTransitionViewModel.keyguardAlpha,

                        goneToAodTransitionViewModel.enterFromTopAnimationAlpha,

                        goneToDozingTransitionViewModel.lockscreenAlpha,

                        goneToDreamingTransitionViewModel.lockscreenAlpha,

                        lockscreenToAodTransitionViewModel.lockscreenAlpha(viewState),

                        lockscreenToDozingTransitionViewModel.lockscreenAlpha,

                        lockscreenToDreamingTransitionViewModel.lockscreenAlpha,

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToGoneTransitionViewModelKosmos.kt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 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 com.android.systemui.keyguard.ui.keyguardTransitionAnimationFlow

import com.android.systemui.kosmos.Kosmos

import kotlinx.coroutines.ExperimentalCoroutinesApi



@ExperimentalCoroutinesApi

val Kosmos.dreamingToGoneTransitionViewModel by

    Kosmos.Fixture {

        DreamingToGoneTransitionViewModel(

            animationFlow = keyguardTransitionAnimationFlow,

        )

    }
 
 No newline at end of file

packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelKosmos.kt

+2 −0
Original line number Diff line number Diff line
@@ -46,10 +46,12 @@ val Kosmos.keyguardRootViewModel by Fixture { 
        dozingToGoneTransitionViewModel = dozingToGoneTransitionViewModel,

        dozingToLockscreenTransitionViewModel = dozingToLockscreenTransitionViewModel,

        dozingToOccludedTransitionViewModel = dozingToOccludedTransitionViewModel,

        dreamingToGoneTransitionViewModel = dreamingToGoneTransitionViewModel,

        dreamingToLockscreenTransitionViewModel = dreamingToLockscreenTransitionViewModel,

        glanceableHubToLockscreenTransitionViewModel = glanceableHubToLockscreenTransitionViewModel,

        goneToAodTransitionViewModel = goneToAodTransitionViewModel,

        goneToDozingTransitionViewModel = goneToDozingTransitionViewModel,

        goneToDreamingTransitionViewModel = goneToDreamingTransitionViewModel,

        lockscreenToAodTransitionViewModel = lockscreenToAodTransitionViewModel,

        lockscreenToDozingTransitionViewModel = lockscreenToDozingTransitionViewModel,

        lockscreenToDreamingTransitionViewModel = lockscreenToDreamingTransitionViewModel,