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

Commit 9a0b4802 authored by Sherry Zhou's avatar Sherry Zhou Committed by Automerger Merge Worker
Browse files

Merge "Fix keyguardStatusView disappearing when unlocking and locking the... 

Merge "Fix keyguardStatusView disappearing when unlocking and locking the device very quickly" into udc-qpr-dev am: a59465bb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24760402



Change-Id: I138a0b30af973cfcf6304095f2e8e0c4e853b605
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2f7b0726 a59465bb

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)