commit dadafd4109c69f088893e72551d50a3cc04d085e
author Jorim Jaggi <jjaggi@google.com> Fri Sep 30 07:20:25 2016 -0700
committer Jorim Jaggi <jjaggi@google.com> Mon Oct 03 05:56:47 2016 -0700
tree d1cbf23bfe864f3364655d8522f044d9a2b5de7a
parent a04451827ebfb9248fe6897eaa2c09b00f15b09c

Reload state when user unlocks

Test: Unlock freshly booted non-FBE device, make sure the transition
is fast as well as the icons have the correct state

Change-Id: I6427427d16edeceb0f410be0b88de601a3dffdb4
Fixes: 31203310

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 ae75229..1cf7a23 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -233,6 +233,7 @@
         mKeyguardBottomArea = (KeyguardBottomAreaView) findViewById(R.id.keyguard_bottom_area);
         mQsNavbarScrim = findViewById(R.id.qs_navbar_scrim);
         mAfforanceHelper = new KeyguardAffordanceHelper(this, getContext());
+        mKeyguardBottomArea.setAffordanceHelper(mAfforanceHelper);
         mLastOrientation = getResources().getConfiguration().orientation;
 
         mQsAutoReinflateContainer =
@@ -1016,7 +1017,6 @@
             mKeyguardStatusBar.setVisibility(keyguardShowing ? View.VISIBLE : View.INVISIBLE);
             if (keyguardShowing && oldState != mStatusBarState) {
                 mKeyguardBottomArea.onKeyguardShowingChanged();
-                mAfforanceHelper.updatePreviews();
             }
         }
         if (keyguardShowing) {