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

Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev

Browse Source
This commit is contained in:
Selim Cinek
2015-06-26 15:26:06 +00:00
committed by Android (Google) Code Review
parent a2e0dc4d20 2a46d68571
commit eb4ce1d6a3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
View File

@@ -213,7 +213,8 @@ public class LockIcon extends KeyguardAffordanceView {
return R.drawable.lockscreen_fingerprint_fp_to_error_state_animation; return R.drawable.lockscreen_fingerprint_fp_to_error_state_animation;
} else if (oldState == STATE_FINGERPRINT_ERROR && newState == STATE_FINGERPRINT) { } else if (oldState == STATE_FINGERPRINT_ERROR && newState == STATE_FINGERPRINT) {
return R.drawable.lockscreen_fingerprint_error_state_to_fp_animation; 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; return R.drawable.lockscreen_fingerprint_draw_off_animation;
} else if (newState == STATE_FINGERPRINT && !oldScreenOn && screenOn) { } else if (newState == STATE_FINGERPRINT && !oldScreenOn && screenOn) {
return R.drawable.lockscreen_fingerprint_draw_on_animation; return R.drawable.lockscreen_fingerprint_draw_on_animation;
@@ -225,14 +226,14 @@ public class LockIcon extends KeyguardAffordanceView {
private int getState() { private int getState() {
boolean fingerprintRunning = boolean fingerprintRunning =
KeyguardUpdateMonitor.getInstance(mContext).isFingerprintDetectionRunning(); KeyguardUpdateMonitor.getInstance(mContext).isFingerprintDetectionRunning();
if (mTransientFpError) { if (mUnlockMethodCache.isCurrentlyInsecure()) {
return STATE_LOCK_OPEN;
} else if (mTransientFpError) {
return STATE_FINGERPRINT_ERROR; return STATE_FINGERPRINT_ERROR;
} else if (fingerprintRunning) { } else if (fingerprintRunning) {
return STATE_FINGERPRINT; return STATE_FINGERPRINT;
} else if (mUnlockMethodCache.isFaceUnlockRunning()) { } else if (mUnlockMethodCache.isFaceUnlockRunning()) {
return STATE_FACE_UNLOCK; return STATE_FACE_UNLOCK;
} else if (mUnlockMethodCache.isCurrentlyInsecure()) {
return STATE_LOCK_OPEN;
} else { } else {
return STATE_LOCKED; return STATE_LOCKED;
} }