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

Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev

Browse Source
This commit is contained in:
Selim Cinek
2015-07-25 01:48:16 +00:00
committed by Android (Google) Code Review
parent f325548992 ad7310f013
commit d9f1a0c3a4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -460,15 +460,20 @@ public class KeyguardViewMediator extends SystemUI {
@Override
public void onFingerprintAuthenticated(int userId, boolean wakeAndUnlocking) {
boolean unlockingWithFingerprintAllowed =
mUpdateMonitor.isUnlockingWithFingerprintAllowed();
if (mStatusBarKeyguardViewManager.isBouncerShowing()) {
if (mUpdateMonitor.isUnlockingWithFingerprintAllowed()) {
if (unlockingWithFingerprintAllowed) {
mStatusBarKeyguardViewManager.notifyKeyguardAuthenticated();
}
} else {
if (wakeAndUnlocking) {
if (wakeAndUnlocking && unlockingWithFingerprintAllowed) {
mWakeAndUnlocking = true;
keyguardDone(true, true);
} else {
if (wakeAndUnlocking) {
mStatusBarKeyguardViewManager.notifyScreenWakeUpRequested();
}
mStatusBarKeyguardViewManager.animateCollapsePanels(
FINGERPRINT_COLLAPSE_SPEEDUP_FACTOR);
}