Merge "Add padlock to the top of the bouncer"

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index babee53,1e8f67f..253bdfb
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@@ -325,15 -324,8 +324,16 @@@ public class NotificationPanelView exte
      private final ShadeController mShadeController =
              Dependency.get(ShadeController.class);
      private int mDisplayId;
+     private KeyguardBouncer mBouncer;
  
 +    /**
 +     * Cache the resource id of the theme to avoid unnecessary work in onThemeChanged.
 +     *
 +     * onThemeChanged is forced when the theme might not have changed. So, to avoid unncessary
 +     * work, check the current id with the cached id.
 +     */
 +    private int mThemeResId;
 +
      @Inject
      public NotificationPanelView(@Named(VIEW_CONTEXT) Context context, AttributeSet attrs,
              NotificationWakeUpCoordinator coordinator,

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
Simple merge