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

Commit a50edca2 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "AOD: Fix flicker when unlocking with fingerprint" into oc-dr1-dev 

am: 88265d29

Change-Id: Ic731a28f8fae87758dd5774dcf71c2ebd2f5c3d9
parents 0efb0644 88265d29

packages/SystemUI/src/com/android/systemui/statusbar/phone/FingerprintUnlockController.java

+4 −1
Original line number Diff line number Diff line
@@ -269,10 +269,13 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { 


    private int calculateMode() {

        boolean unlockingAllowed = mUpdateMonitor.isUnlockingWithFingerprintAllowed();

        boolean pulsing = mDozeScrimController.isPulsing();

        boolean dozingWithScreenOn = mStatusBar.isDozing() && !mStatusBar.isScreenFullyOff();



        if (!mUpdateMonitor.isDeviceInteractive()) {

            if (!mStatusBarKeyguardViewManager.isShowing()) {

                return MODE_ONLY_WAKE;

            } else if (mDozeScrimController.isPulsing() && unlockingAllowed) {

            } else if ((pulsing || dozingWithScreenOn) && unlockingAllowed) {

                return MODE_WAKE_AND_UNLOCK_PULSING;

            } else if (unlockingAllowed || !mUnlockMethodCache.isMethodSecure()) {

                return MODE_WAKE_AND_UNLOCK;

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+8 −0
Original line number Diff line number Diff line
@@ -5166,6 +5166,14 @@ public class StatusBar extends SystemUI implements DemoMode, 
        mDozeScrimController.onScreenTurnedOn();

    }



    /**

     * @return true if the screen is currently fully off, i.e. has finished turning off and has

     *         since not started turning on.

     */

    public boolean isScreenFullyOff() {

        return mScreenFullyOff;

    }



    @Override

    public void showScreenPinningRequest(int taskId) {

        if (mKeyguardMonitor.isShowing()) {