commit fc22296ff5eefb328b4cddb9ee16b2bf38d7bc6b
author Selim Cinek <cinek@google.com> Fri Jul 20 20:09:23 2018 -0700
committer Selim Cinek <cinek@google.com> Tue Jul 24 15:25:32 2018 +0000
tree 4ca8b6df7f17e249847ae00fba890dbaeb012166
parent d54c3a3036430043e6408a6d5de3a09885fdf474

Fixed an issue where the keyguard statusbar could be showing

Test: unlock with AoD on with fingerprint, pull down shade.
Change-Id: I9a5f0f1ae9880f048a3655f5199106cdda03eba5
Fixes: 111127399

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 2f18aad9..3a65c5c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -1342,9 +1342,7 @@
         mQsExpansionHeight = height;
         updateQsExpansion();
         requestScrollerTopPaddingUpdate(false /* animate */);
-        if (mKeyguardShowing) {
-            updateHeaderKeyguardAlpha();
-        }
+        updateHeaderKeyguardAlpha();
         if (mStatusBarState == StatusBarState.SHADE_LOCKED
                 || mStatusBarState == StatusBarState.KEYGUARD) {
             updateKeyguardBottomAreaAlpha();
@@ -1747,6 +1745,9 @@
     }
 
     private void updateHeaderKeyguardAlpha() {
+        if (!mKeyguardShowing) {
+            return;
+        }
         float alphaQsExpansion = 1 - Math.min(1, getQsExpansionFraction() * 2);
         mKeyguardStatusBar.setAlpha(Math.min(getKeyguardContentsAlpha(), alphaQsExpansion)
                 * mKeyguardStatusBarAnimateAlpha);