diff options
author | Winson Chung <winsonc@google.com> | 2012-11-27 11:36:13 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-27 11:36:13 -0800 |
commit | d0079891e3a8034f560eaf88d5be692b61ca4b9a (patch) | |
tree | ef8c8b5ff5e09c9597fdb39f4307a46c9cd69acf /policy | |
parent | d3de79538bc87e769e876866f38b8c9048940d4b (diff) | |
parent | 9f6e8ddf5d48a695b26f1d9759696b56952177bd (diff) | |
download | frameworks_base-d0079891e3a8034f560eaf88d5be692b61ca4b9a.zip frameworks_base-d0079891e3a8034f560eaf88d5be692b61ca4b9a.tar.gz frameworks_base-d0079891e3a8034f560eaf88d5be692b61ca4b9a.tar.bz2 |
am 9f6e8ddf: am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev
* commit '9f6e8ddf5d48a695b26f1d9759696b56952177bd':
Removing unecessary additional lock metadata from QuickSettings user tile.
Diffstat (limited to 'policy')
-rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java | 6 | ||||
-rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java | 5 |
2 files changed, 1 insertions, 10 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java index 4e8aba7..9bc0111 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java @@ -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) { diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java index c227619..7d757ff 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java @@ -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); |