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

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

Merge "Fix DREAMING->AOD animation" into main

parents 7fdb530e 8f74c7e7

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

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState.DREAMING 
import com.android.systemui.keyguard.ui.KeyguardTransitionAnimationFlow

import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransition

import javax.inject.Inject

import kotlin.time.Duration.Companion.milliseconds

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.emptyFlow
@@ -45,6 +46,13 @@ constructor( 
            edge = Edge.create(from = DREAMING, to = AOD),

        )



    /** Lockscreen views alpha */

    val lockscreenAlpha: Flow<Float> =

        transitionAnimation.sharedFlow(

            duration = 300.milliseconds,

            onStep = { it },

        )



    val deviceEntryBackgroundViewAlpha: Flow<Float> =

        transitionAnimation.immediatelyTransitionTo(0f)

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

+3 −1
Original line number Diff line number Diff line
@@ -91,8 +91,9 @@ constructor( 
    private val dozingToGoneTransitionViewModel: DozingToGoneTransitionViewModel,

    private val dozingToLockscreenTransitionViewModel: DozingToLockscreenTransitionViewModel,

    private val dozingToOccludedTransitionViewModel: DozingToOccludedTransitionViewModel,

    private val dreamingToLockscreenTransitionViewModel: DreamingToLockscreenTransitionViewModel,

    private val dreamingToAodTransitionViewModel: DreamingToAodTransitionViewModel,

    private val dreamingToGoneTransitionViewModel: DreamingToGoneTransitionViewModel,

    private val dreamingToLockscreenTransitionViewModel: DreamingToLockscreenTransitionViewModel,

    private val glanceableHubToLockscreenTransitionViewModel:

        GlanceableHubToLockscreenTransitionViewModel,

    private val goneToAodTransitionViewModel: GoneToAodTransitionViewModel,
@@ -243,6 +244,7 @@ constructor( 
                        dozingToGoneTransitionViewModel.lockscreenAlpha(viewState),

                        dozingToLockscreenTransitionViewModel.lockscreenAlpha,

                        dozingToOccludedTransitionViewModel.lockscreenAlpha(viewState),

                        dreamingToAodTransitionViewModel.lockscreenAlpha,

                        dreamingToGoneTransitionViewModel.lockscreenAlpha,

                        dreamingToLockscreenTransitionViewModel.lockscreenAlpha,

                        glanceableHubToLockscreenTransitionViewModel.keyguardAlpha,

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

0 → 100644
+32 −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.

 */



@file:OptIn(ExperimentalCoroutinesApi::class)



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



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

import com.android.systemui.keyguard.ui.keyguardTransitionAnimationFlow

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.Kosmos.Fixture

import kotlinx.coroutines.ExperimentalCoroutinesApi



var Kosmos.dreamingToAodTransitionViewModel by Fixture {

    DreamingToAodTransitionViewModel(

        deviceEntryUdfpsInteractor = deviceEntryUdfpsInteractor,

        animationFlow = keyguardTransitionAnimationFlow,

    )

}

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

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ val Kosmos.keyguardRootViewModel by Fixture { 
        dozingToGoneTransitionViewModel = dozingToGoneTransitionViewModel,

        dozingToLockscreenTransitionViewModel = dozingToLockscreenTransitionViewModel,

        dozingToOccludedTransitionViewModel = dozingToOccludedTransitionViewModel,

        dreamingToAodTransitionViewModel = dreamingToAodTransitionViewModel,

        dreamingToGoneTransitionViewModel = dreamingToGoneTransitionViewModel,

        dreamingToLockscreenTransitionViewModel = dreamingToLockscreenTransitionViewModel,

        glanceableHubToLockscreenTransitionViewModel = glanceableHubToLockscreenTransitionViewModel,