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

Commit 10b0c047 authored by cocod's avatar cocod
Browse files

Fix lock icon not showing on hub after exiting the edit mode 

Add a ViewModel for Gone->GH transition. As we now show the hub
before the device is locked and the transition starts.

Bug: b/325108777
Test: manually by exiting edit mode and verifying lock icon animates in
Flag: com.android.systemui.communal_hub
Change-Id: Id1b2450445fe538f1ee9a4611e1d6d07f695c2f9
parent 106560ec

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -169,6 +169,7 @@ constructor( 
                    KeyguardState.AOD -> TO_AOD_DURATION

                    KeyguardState.AOD -> TO_AOD_DURATION

                    KeyguardState.DOZING -> TO_DOZING_DURATION

                    KeyguardState.DOZING -> TO_DOZING_DURATION

                    KeyguardState.LOCKSCREEN -> TO_LOCKSCREEN_DURATION

                    KeyguardState.LOCKSCREEN -> TO_LOCKSCREEN_DURATION

                    KeyguardState.GLANCEABLE_HUB -> TO_GLANCEABLE_HUB_DURATION

                    else -> DEFAULT_DURATION

                    else -> DEFAULT_DURATION

                }.inWholeMilliseconds

                }.inWholeMilliseconds

        }

        }
@@ -181,5 +182,6 @@ constructor( 
        val TO_AOD_DURATION = 1300.milliseconds

        val TO_AOD_DURATION = 1300.milliseconds

        val TO_DOZING_DURATION = 933.milliseconds

        val TO_DOZING_DURATION = 933.milliseconds

        val TO_LOCKSCREEN_DURATION = DEFAULT_DURATION

        val TO_LOCKSCREEN_DURATION = DEFAULT_DURATION

        val TO_GLANCEABLE_HUB_DURATION = DEFAULT_DURATION

    }

    }

}
 
}

packages/SystemUI/src/com/android/systemui/keyguard/ui/transitions/DeviceEntryIconTransitionModule.kt

+7 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.systemui.keyguard.ui.viewmodel.GlanceableHubToDreamingTransit 
import com.android.systemui.keyguard.ui.viewmodel.GlanceableHubToOccludedTransitionViewModel

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

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

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

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

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

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

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

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

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

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

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

import com.android.systemui.keyguard.ui.viewmodel.LockscreenToDozingTransitionViewModel
@@ -246,4 +247,10 @@ abstract class DeviceEntryIconTransitionModule { 
    abstract fun occludedToGlanceableHub(

    abstract fun occludedToGlanceableHub(

        impl: OccludedToGlanceableHubTransitionViewModel

        impl: OccludedToGlanceableHubTransitionViewModel

    ): DeviceEntryIconTransition

    ): DeviceEntryIconTransition



    @Binds

    @IntoSet

    abstract fun goneToGlanceableHub(

        impl: GoneToGlanceableHubTransitionViewModel

    ): DeviceEntryIconTransition

}
 
}

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

0 → 100644
+50 −0
Original line number Original line 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.FromGoneTransitionInteractor.Companion.TO_GLANCEABLE_HUB_DURATION

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

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

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

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

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

import com.android.systemui.scene.shared.model.Scenes

import javax.inject.Inject

import kotlin.time.Duration.Companion.milliseconds

import kotlinx.coroutines.flow.Flow



@SysUISingleton

class GoneToGlanceableHubTransitionViewModel

@Inject

constructor(

    animationFlow: KeyguardTransitionAnimationFlow,

) : DeviceEntryIconTransition {



    private val transitionAnimation =

        animationFlow

            .setup(duration = TO_GLANCEABLE_HUB_DURATION, edge = Edge.create(GONE, Scenes.Communal))

            .setupWithoutSceneContainer(edge = Edge.create(GONE, GLANCEABLE_HUB))



    override val deviceEntryParentViewAlpha: Flow<Float> =

        transitionAnimation.sharedFlow(

            duration = 167.milliseconds,

            onStep = { it },

            onCancel = { 0f },

            onFinish = { 1f },

        )

}