Merge "SysUI: Respect "no notifs on lockscreen" setting" into lmp-dev

2 files changed, 3 insertions, 14 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 8eca0ae..4b037d2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -220,7 +220,7 @@ public abstract class BaseStatusBar extends SystemUI implements
             setZenMode(mode);
             final boolean show = Settings.Global.getInt(mContext.getContentResolver(),
                     Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS, 1) != 0;
-            setShowLockscreenNotifications(show);
+            mShowLockscreenNotifications = show;
         }
     };
 
@@ -1423,7 +1423,8 @@ public abstract class BaseStatusBar extends SystemUI implements
     }
 
     private boolean shouldShowOnKeyguard(StatusBarNotification sbn) {
-        return sbn.getNotification().priority >= Notification.PRIORITY_LOW;
+        return mShowLockscreenNotifications &&
+                sbn.getNotification().priority >= Notification.PRIORITY_LOW;
     }
 
     protected void setZenMode(int mode) {
@@ -1432,10 +1433,6 @@ public abstract class BaseStatusBar extends SystemUI implements
         updateNotifications();
     }
 
-    protected void setShowLockscreenNotifications(boolean show) {
-        mShowLockscreenNotifications = show;
-    }
-
     protected abstract void haltTicker();
     protected abstract void setAreThereNotifications();
     protected abstract void updateNotifications();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 5e54b30..0284036 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -537,12 +537,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
     };
 
     @Override
-    protected void setShowLockscreenNotifications(boolean show) {
-        super.setShowLockscreenNotifications(show);
-        updateStackScrollerState();
-    }
-
-    @Override
     public void start() {
         mDisplay = ((WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE))
                 .getDefaultDisplay();
@@ -3435,8 +3429,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         if (mStackScroller == null) return;
         boolean onKeyguard = mState == StatusBarState.KEYGUARD;
         mStackScroller.setDimmed(onKeyguard, false /* animate */);
-        mStackScroller.setVisibility(!mShowLockscreenNotifications && onKeyguard
-                ? View.INVISIBLE : View.VISIBLE);
         mStackScroller.setExpandingEnabled(!onKeyguard);
         ActivatableNotificationView activatedChild = mStackScroller.getActivatedChild();
         mStackScroller.setActivatedChild(null);