Merge "Remove unused LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS usage" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
68ec906eba
@@ -189,7 +189,6 @@ public class NotificationLockscreenUserManagerImpl implements
|
|||||||
protected NotificationPresenter mPresenter;
|
protected NotificationPresenter mPresenter;
|
||||||
protected ContentObserver mLockscreenSettingsObserver;
|
protected ContentObserver mLockscreenSettingsObserver;
|
||||||
protected ContentObserver mSettingsObserver;
|
protected ContentObserver mSettingsObserver;
|
||||||
private boolean mHideSilentNotificationsOnLockscreen;
|
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public NotificationLockscreenUserManagerImpl(Context context,
|
public NotificationLockscreenUserManagerImpl(Context context,
|
||||||
@@ -265,12 +264,6 @@ public class NotificationLockscreenUserManagerImpl implements
|
|||||||
mLockscreenSettingsObserver,
|
mLockscreenSettingsObserver,
|
||||||
UserHandle.USER_ALL);
|
UserHandle.USER_ALL);
|
||||||
|
|
||||||
mContext.getContentResolver().registerContentObserver(
|
|
||||||
mSecureSettings.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS),
|
|
||||||
true,
|
|
||||||
mLockscreenSettingsObserver,
|
|
||||||
UserHandle.USER_ALL);
|
|
||||||
|
|
||||||
mContext.getContentResolver().registerContentObserver(
|
mContext.getContentResolver().registerContentObserver(
|
||||||
Settings.Global.getUriFor(Settings.Global.ZEN_MODE), false,
|
Settings.Global.getUriFor(Settings.Global.ZEN_MODE), false,
|
||||||
mSettingsObserver);
|
mSettingsObserver);
|
||||||
@@ -340,9 +333,6 @@ public class NotificationLockscreenUserManagerImpl implements
|
|||||||
final boolean allowedByDpm = (dpmFlags
|
final boolean allowedByDpm = (dpmFlags
|
||||||
& DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS) == 0;
|
& DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS) == 0;
|
||||||
|
|
||||||
mHideSilentNotificationsOnLockscreen = mSecureSettings.getIntForUser(
|
|
||||||
Settings.Secure.LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS, 1, mCurrentUserId) == 0;
|
|
||||||
|
|
||||||
setShowLockscreenNotifications(show && allowedByDpm);
|
setShowLockscreenNotifications(show && allowedByDpm);
|
||||||
|
|
||||||
if (ENABLE_LOCK_SCREEN_ALLOW_REMOTE_INPUT) {
|
if (ENABLE_LOCK_SCREEN_ALLOW_REMOTE_INPUT) {
|
||||||
|
|||||||
Reference in New Issue
Block a user