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

am 9f6e8ddf: am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev

Browse Source 
* commit '9f6e8ddf5d48a695b26f1d9759696b56952177bd':
  Removing unecessary additional lock metadata from QuickSettings user tile.
This commit is contained in:
Winson Chung
2012-11-27 11:36:13 -08:00
committed by Android Git Automerger
parent d3de79538b 9f6e8ddf5d
commit d0079891e3
5 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/com/android/internal/widget/LockPatternUtils.java
View File

@ -115,16 +115,6 @@ public class LockPatternUtils {
*/
public static final String KEYGUARD_SHOW_APPWIDGET = "showappwidget";
/**
* Options used to lock the device upon user switch.
*/
public static final Bundle USER_SWITCH_LOCK_OPTIONS = new Bundle();
static {
USER_SWITCH_LOCK_OPTIONS.putBoolean(KEYGUARD_SHOW_USER_SWITCHER, true);
USER_SWITCH_LOCK_OPTIONS.putBoolean(KEYGUARD_SHOW_SECURITY_CHALLENGE, true);
}
/**
* The bit in LOCK_BIOMETRIC_WEAK_FLAGS to be used to indicate whether liveliness should
* be used

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
View File

@ -305,8 +305,7 @@ class QuickSettings {
(UserManager) mContext.getSystemService(Context.USER_SERVICE);
if (um.getUsers(true).size() > 1) {
try {
WindowManagerGlobal.getWindowManagerService().lockNow(
LockPatternUtils.USER_SWITCH_LOCK_OPTIONS);
WindowManagerGlobal.getWindowManagerService().lockNow(null);
} catch (RemoteException e) {
Log.e(TAG, "Couldn't show user switcher", e);
}

6
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java
View File

@ -243,12 +243,6 @@ public class KeyguardViewManager {
}
if (options != null) {
if (options.getBoolean(LockPatternUtils.KEYGUARD_SHOW_USER_SWITCHER)) {
mKeyguardView.goToUserSwitcher();
}
if (options.getBoolean(LockPatternUtils.KEYGUARD_SHOW_SECURITY_CHALLENGE)) {
mKeyguardView.showNextSecurityScreenIfPresent();
}
int widgetToShow = options.getInt(LockPatternUtils.KEYGUARD_SHOW_APPWIDGET,
AppWidgetManager.INVALID_APPWIDGET_ID);
if (widgetToShow != AppWidgetManager.INVALID_APPWIDGET_ID) {

5
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
View File

@ -315,10 +315,7 @@ public class KeyguardViewMediator {
// We need to force a reset of the views, since lockNow (called by
// ActivityManagerService) will not reconstruct the keyguard if it is already showing.
synchronized (KeyguardViewMediator.this) {
Bundle options = new Bundle();
options.putBoolean(LockPatternUtils.KEYGUARD_SHOW_USER_SWITCHER, true);
options.putBoolean(LockPatternUtils.KEYGUARD_SHOW_SECURITY_CHALLENGE, true);
resetStateLocked(options);
resetStateLocked(null);
adjustStatusBarLocked();
// Disable face unlock when the user switches.
KeyguardUpdateMonitor.getInstance(mContext).setAlternateUnlockEnabled(false);

2
services/java/com/android/server/am/ActivityManagerService.java
View File

@ -14168,7 +14168,7 @@ public final class ActivityManagerService extends ActivityManagerNative
// Once the internal notion of the active user has switched, we lock the device
// with the option to show the user switcher on the keyguard.
mWindowManager.lockNow(LockPatternUtils.USER_SWITCH_LOCK_OPTIONS);
mWindowManager.lockNow(null);
final UserStartedState uss = mStartedUsers.get(userId);