commit cbb72aabeb2151aafa583b7d7fe969cc3aff44e4
author Selim Cinek <cinek@google.com> Tue Jul 24 18:33:21 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jul 24 18:33:21 2018 -0700
tree fc2d28e83ff367eaf316164c0ce8fa13b3feb32a
parent 156b7884140d0452045e679ddb60d91c2fba9fb1
parent 69903749e26de674592a044532cac184290e17af

Merge "Fixed an issue where the keyguard statusbar could be showing" into pi-dev am: 693a915de8
am: 69903749e2

Change-Id: If26b9b52011d8130a79bf97cf6d69e62f90f254e

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 1dfa5b7..be8bf02 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -1360,9 +1360,7 @@
         mQsExpansionHeight = height;
         updateQsExpansion();
         requestScrollerTopPaddingUpdate(false /* animate */);
-        if (mKeyguardShowing) {
-            updateHeaderKeyguardAlpha();
-        }
+        updateHeaderKeyguardAlpha();
         if (mStatusBarState == StatusBarState.SHADE_LOCKED
                 || mStatusBarState == StatusBarState.KEYGUARD) {
             updateKeyguardBottomAreaAlpha();
@@ -1765,6 +1763,9 @@
     }
 
     private void updateHeaderKeyguardAlpha() {
+        if (!mKeyguardShowing) {
+            return;
+        }
         float alphaQsExpansion = 1 - Math.min(1, getQsExpansionFraction() * 2);
         mKeyguardStatusBar.setAlpha(Math.min(getKeyguardContentsAlpha(), alphaQsExpansion)
                 * mKeyguardStatusBarAnimateAlpha);