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

Commit ca7a2e88 authored by Sherry Zhou's avatar Sherry Zhou
Browse files

Fix keyguardStatusView disappearing when unlocking and locking the device very quickly 

Bug: 290627350
Test: manual
Change-Id: I9153201ea82de93571841f7b3b6efac76a9da0d9
(cherry picked from commit 74bed64e)
parent 0be36f0c

packages/SystemUI/src/com/android/keyguard/KeyguardVisibilityHelper.java

+11 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.keyguard;



import static com.android.systemui.statusbar.StatusBarState.KEYGUARD;

import static com.android.systemui.statusbar.StatusBarState.SHADE;



import android.util.Property;

import android.view.View;
@@ -124,7 +125,16 @@ public class KeyguardVisibilityHelper { 
                    true /* animate */);

            log("keyguardFadingAway transition w/ Y Aniamtion");

        } else if (statusBarState == KEYGUARD) {

            if (keyguardFadingAway) {

            // Sometimes, device will be unlocked and then locked very quickly.

            // keyguardFadingAway hasn't been set to false cause unlock animation hasn't finished

            // So we should not animate keyguard fading away in this case (when oldState is SHADE)

            if (oldStatusBarState != SHADE) {

                log("statusBarState == KEYGUARD && oldStatusBarState != SHADE");

            } else {

                log("statusBarState == KEYGUARD && oldStatusBarState == SHADE");

            }



            if (keyguardFadingAway && oldStatusBarState != SHADE) {

                mKeyguardViewVisibilityAnimating = true;

                AnimationProperties animProps = new AnimationProperties()

                        .setDelay(0)