Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove RemoteInput on lockscreen setting" into nyc-dev

Browse Source
This commit is contained in:
Adrian Roos
2016-06-16 23:33:55 +00:00
committed by Android (Google) Code Review
parent bc7b3b5e52 b27d7a5e2e
commit a66746d167
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,6 +134,7 @@ public abstract class BaseStatusBar extends SystemUI implements
= SystemProperties.getBoolean("debug.child_notifs", true); = SystemProperties.getBoolean("debug.child_notifs", true);
public static final boolean FORCE_REMOTE_INPUT_HISTORY = public static final boolean FORCE_REMOTE_INPUT_HISTORY =
SystemProperties.getBoolean("debug.force_remoteinput_history", false); SystemProperties.getBoolean("debug.force_remoteinput_history", false);
private static boolean ENABLE_LOCK_SCREEN_ALLOW_REMOTE_INPUT = false;
protected static final int MSG_SHOW_RECENT_APPS = 1019; protected static final int MSG_SHOW_RECENT_APPS = 1019;
protected static final int MSG_HIDE_RECENT_APPS = 1020; protected static final int MSG_HIDE_RECENT_APPS = 1020;
@@ -704,10 +705,13 @@ public abstract class BaseStatusBar extends SystemUI implements
Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS), false, Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS), false,
mSettingsObserver, mSettingsObserver,
UserHandle.USER_ALL); UserHandle.USER_ALL);
if (ENABLE_LOCK_SCREEN_ALLOW_REMOTE_INPUT) {
mContext.getContentResolver().registerContentObserver( mContext.getContentResolver().registerContentObserver(
Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT), false, Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT),
false,
mSettingsObserver, mSettingsObserver,
UserHandle.USER_ALL); UserHandle.USER_ALL);
}
mContext.getContentResolver().registerContentObserver( mContext.getContentResolver().registerContentObserver(
Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS), Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS),
@@ -2304,16 +2308,20 @@ public abstract class BaseStatusBar extends SystemUI implements
final boolean allowedByDpm = (dpmFlags final boolean allowedByDpm = (dpmFlags
& DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS) == 0; & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS) == 0;
setShowLockscreenNotifications(show && allowedByDpm);
if (ENABLE_LOCK_SCREEN_ALLOW_REMOTE_INPUT) {
final boolean remoteInput = Settings.Secure.getIntForUser(mContext.getContentResolver(), final boolean remoteInput = Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT, Settings.Secure.LOCK_SCREEN_ALLOW_REMOTE_INPUT,
0, 0,
mCurrentUserId) != 0; mCurrentUserId) != 0;
final boolean remoteInputDpm = (dpmFlags final boolean remoteInputDpm =
& DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT) == 0; (dpmFlags & DevicePolicyManager.KEYGUARD_DISABLE_REMOTE_INPUT) == 0;
setShowLockscreenNotifications(show && allowedByDpm);
setLockScreenAllowRemoteInput(remoteInput && remoteInputDpm); setLockScreenAllowRemoteInput(remoteInput && remoteInputDpm);
} else {
setLockScreenAllowRemoteInput(false);
}
} }
protected abstract void setAreThereNotifications(); protected abstract void setAreThereNotifications();