diff options
author | Jorim Jaggi <jjaggi@google.com> | 2014-11-24 20:12:50 +0100 |
---|---|---|
committer | Jorim Jaggi <jjaggi@google.com> | 2014-11-26 14:07:49 +0000 |
commit | 95e89caeb252a54807c76d60c7440766829e418c (patch) | |
tree | 2e5de37ebfb86640fbb598cd2b0f976ed1045e4f /packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java | |
parent | 803a6dc080f883f95cc02f5c9ad850e73f8e76a8 (diff) | |
download | frameworks_base-95e89caeb252a54807c76d60c7440766829e418c.zip frameworks_base-95e89caeb252a54807c76d60c7440766829e418c.tar.gz frameworks_base-95e89caeb252a54807c76d60c7440766829e418c.tar.bz2 |
Fix jank when pin/pattern is shown
- Only update layout params of status bar window when needed
- Do not update security method all the time, only when needed (only
when reset gets called)
- Check for actual used security method when updating states for
bouncer
Bug: 18505838
Change-Id: Ib3d0021c0cc364fa5598e06e0a2bae059ae79cbe
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java')
-rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java index 979c377..faecaed 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -399,8 +399,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe showPrimarySecurityScreen(false); break; } - } else { - showPrimarySecurityScreen(false); } if (finish) { mSecurityCallback.finish(); @@ -556,6 +554,10 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe return mSecurityModel.getSecurityMode(); } + public SecurityMode getCurrentSecurityMode() { + return mCurrentSecuritySelection; + } + public void verifyUnlock() { mIsVerifyUnlockOnly = true; showSecurityScreen(getSecurityMode()); |