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

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

Browse Source 
* commit 'e0c0e93a0f4582fca58733be7a4b1d7a6e6e8029':
  Fixed wake to unlock when the device has never been unlocked
This commit is contained in:
Selim Cinek
2015-07-25 15:54:54 +00:00
committed by Android Git Automerger
parent 5b65bb1bc7 e0c0e93a0f
commit 756d5ac2ed
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 @Override
public void onFingerprintAuthenticated(int userId, boolean wakeAndUnlocking) { public void onFingerprintAuthenticated(int userId, boolean wakeAndUnlocking) {
boolean unlockingWithFingerprintAllowed =
mUpdateMonitor.isUnlockingWithFingerprintAllowed();
if (mStatusBarKeyguardViewManager.isBouncerShowing()) { if (mStatusBarKeyguardViewManager.isBouncerShowing()) {
if (mUpdateMonitor.isUnlockingWithFingerprintAllowed()) { if (unlockingWithFingerprintAllowed) {
mStatusBarKeyguardViewManager.notifyKeyguardAuthenticated(); mStatusBarKeyguardViewManager.notifyKeyguardAuthenticated();
} }
} else { } else {
if (wakeAndUnlocking) { if (wakeAndUnlocking && unlockingWithFingerprintAllowed) {
mWakeAndUnlocking = true; mWakeAndUnlocking = true;
keyguardDone(true, true); keyguardDone(true, true);
} else { } else {
if (wakeAndUnlocking) {
mStatusBarKeyguardViewManager.notifyScreenWakeUpRequested();
}
mStatusBarKeyguardViewManager.animateCollapsePanels( mStatusBarKeyguardViewManager.animateCollapsePanels(
FINGERPRINT_COLLAPSE_SPEEDUP_FACTOR); FINGERPRINT_COLLAPSE_SPEEDUP_FACTOR);
} }