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

am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev

Browse Source 
* commit '1b5cc3a4ba46029b798adb9e362d87df5673bc52':
  Show face unlock even when fingerprint is running
This commit is contained in:
Adrian Roos
2015-09-03 19:08:53 +00:00
committed by Android Git Automerger
parent cb92577aa6 1b5cc3a4ba
commit b90f1de216
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,10 +248,10 @@ public class LockIcon extends KeyguardAffordanceView {
return STATE_FINGERPRINT_ERROR;
} else if (mUnlockMethodCache.canSkipBouncer()) {
return STATE_LOCK_OPEN;
} else if (fingerprintRunning && unlockingAllowed) {
return STATE_FINGERPRINT;
} else if (mUnlockMethodCache.isFaceUnlockRunning()) {
return STATE_FACE_UNLOCK;
} else if (fingerprintRunning && unlockingAllowed) {
return STATE_FINGERPRINT;
} else {
return STATE_LOCKED;
}