Merge "Honor Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-preview-dev (f68e9d83) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -182,6 +182,7 @@ public abstract class BaseStatusBar extends SystemUI implements
		*/
		protected int mState;
		protected boolean mBouncerShowing;
		protected boolean mShowLockscreenNotifications;

		protected NotificationOverflowContainer mKeyguardIconOverflowContainer;

		@@ -201,6 +202,9 @@ public abstract class BaseStatusBar extends SystemUI implements
		final int mode = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.ZEN_MODE, Settings.Global.ZEN_MODE_OFF);
		setZenMode(mode);
		final boolean show = Settings.Global.getInt(mContext.getContentResolver(),
		Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS, 1) != 0;
		setShowLockscreenNotifications(show);
		}
		};

		@@ -362,6 +366,9 @@ public abstract class BaseStatusBar extends SystemUI implements
		mContext.getContentResolver().registerContentObserver(
		Settings.Global.getUriFor(Settings.Global.ZEN_MODE), false,
		mSettingsObserver);
		mContext.getContentResolver().registerContentObserver(
		Settings.Global.getUriFor(Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS), false,
		mSettingsObserver);

		mContext.getContentResolver().registerContentObserver(
		Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS),
		@@ -1247,6 +1254,10 @@ 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();

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -504,6 +504,12 @@ 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))
		@@ -2851,7 +2857,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}

		public void updateStackScrollerState() {
		if (mStackScroller == null) return;
		mStackScroller.setDimmed(mState == StatusBarState.KEYGUARD, false /* animate */);
		mStackScroller.setVisibility(!mShowLockscreenNotifications && mState == StatusBarState.KEYGUARD
		? View.INVISIBLE : View.VISIBLE);
		}

		public void userActivity() {