drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Honor Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS." into lmp-preview-dev

Browse Source
This commit is contained in:
John Spurlock
2014-05-29 22:03:26 +00:00
committed by Android (Google) Code Review
parent 457fa27704 4b3bda2225
commit f68e9d834c
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@ -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();

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

@ -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() {