diff options
| author | Selim Cinek <cinek@google.com> | 2015-06-26 15:26:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-26 15:26:08 +0000 |
| commit | eb4ce1d6a3bfa99ec57604aa842835a381616346 (patch) | |
| tree | 236e63ca0e023eaeaf1ed53483a0f4dc8b946dc2 | |
| parent | a2e0dc4d20be14ea106b44067cc782774d90df3b (diff) | |
| parent | 2a46d6857172e6f9dfedb150f7eda8dba65eaf91 (diff) | |
| download | frameworks_base-eb4ce1d6a3bfa99ec57604aa842835a381616346.zip frameworks_base-eb4ce1d6a3bfa99ec57604aa842835a381616346.tar.gz frameworks_base-eb4ce1d6a3bfa99ec57604aa842835a381616346.tar.bz2 | |
Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java index f5fdf48..6bcb766 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java @@ -213,7 +213,8 @@ public class LockIcon extends KeyguardAffordanceView { return R.drawable.lockscreen_fingerprint_fp_to_error_state_animation; } else if (oldState == STATE_FINGERPRINT_ERROR && newState == STATE_FINGERPRINT) { return R.drawable.lockscreen_fingerprint_error_state_to_fp_animation; - } else if (oldState == STATE_FINGERPRINT && newState == STATE_LOCK_OPEN) { + } else if (oldState == STATE_FINGERPRINT && newState == STATE_LOCK_OPEN + && !mUnlockMethodCache.isCurrentlyInsecure()) { return R.drawable.lockscreen_fingerprint_draw_off_animation; } else if (newState == STATE_FINGERPRINT && !oldScreenOn && screenOn) { return R.drawable.lockscreen_fingerprint_draw_on_animation; @@ -225,14 +226,14 @@ public class LockIcon extends KeyguardAffordanceView { private int getState() { boolean fingerprintRunning = KeyguardUpdateMonitor.getInstance(mContext).isFingerprintDetectionRunning(); - if (mTransientFpError) { + if (mUnlockMethodCache.isCurrentlyInsecure()) { + return STATE_LOCK_OPEN; + } else if (mTransientFpError) { return STATE_FINGERPRINT_ERROR; } else if (fingerprintRunning) { return STATE_FINGERPRINT; } else if (mUnlockMethodCache.isFaceUnlockRunning()) { return STATE_FACE_UNLOCK; - } else if (mUnlockMethodCache.isCurrentlyInsecure()) { - return STATE_LOCK_OPEN; } else { return STATE_LOCKED; } |