Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd89d2a0 authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am 756d5ac2: am e0c0e93a: am d9f1a0c3: Merge "Fixed wake to unlock when the... 

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

* commit '756d5ac2':
  Fixed wake to unlock when the device has never been unlocked
parents 5efe21e4 756d5ac2

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -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);

                }

                }