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

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

Merge "Merge "AOD: Only force doze brightness when actually unlocking" into... 

Merge "Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev am: afda883f am: 2168aff8" into oc-mr1-dev-plus-aosp
am: f3ca2bfd

Change-Id: I38c8bb15b78648102f813079c1a0ece9ac7eed83
parents be3ec042 f3ca2bfd

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

+7 −11
Original line number Diff line number Diff line
@@ -166,14 +166,6 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { 
            }

            mHandler.postDelayed(mReleaseFingerprintWakeLockRunnable,

                    FINGERPRINT_WAKELOCK_TIMEOUT_MS);



            if (pulsingOrAod()) {

                // If we are waking the device up while we are pulsing the clock and the

                // notifications would light up first, creating an unpleasant animation.

                // Defer changing the screen brightness by forcing doze brightness on our window

                // until the clock and the notifications are faded out.

                mStatusBarWindowManager.setForceDozeBrightness(true);

            }

        }

        Trace.endSection();

    }
@@ -194,6 +186,13 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { 
        }

        boolean wasDeviceInteractive = mUpdateMonitor.isDeviceInteractive();

        mMode = calculateMode();

        if (mMode == MODE_WAKE_AND_UNLOCK_PULSING && pulsingOrAod()) {

            // If we are waking the device up while we are pulsing the clock and the

            // notifications would light up first, creating an unpleasant animation.

            // Defer changing the screen brightness by forcing doze brightness on our window

            // until the clock and the notifications are faded out.

            mStatusBarWindowManager.setForceDozeBrightness(true);

        }

        if (!wasDeviceInteractive) {

            if (DEBUG_FP_WAKELOCK) {

                Log.i(TAG, "fp wakelock: Authenticated, waking up...");
@@ -244,9 +243,6 @@ public class FingerprintUnlockController extends KeyguardUpdateMonitorCallback { 
            case MODE_NONE:

                break;

        }

        if (mMode != MODE_WAKE_AND_UNLOCK_PULSING) {

            mStatusBarWindowManager.setForceDozeBrightness(false);

        }

        mStatusBar.notifyFpAuthModeChanged();

        Trace.endSection();

    }