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

Commit 78ef14e8 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Reset to LiftReveal when going to sleep due to timing out, after a... 

Merge "Reset to LiftReveal when going to sleep due to timing out, after a biometric auth." into sc-dev am: 7db2ece5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15362342

Change-Id: I510099b47cf008bbf82a4fe6e67ad3af452022c1
parents 4f950d79 7db2ece5

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

+5 −1
Original line number Diff line number Diff line
@@ -3951,7 +3951,11 @@ public class StatusBar extends SystemUI implements DemoMode, 
                || !wakingUp && mWakefulnessLifecycle.getLastSleepReason()

                == PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON) {

            mLightRevealScrim.setRevealEffect(mPowerButtonReveal);

        } else if (!(mLightRevealScrim.getRevealEffect() instanceof CircleReveal)) {

        } else if (!wakingUp || !(mLightRevealScrim.getRevealEffect() instanceof CircleReveal)) {

            // If we're going to sleep, but it's not from the power button, use the default reveal.

            // If we're waking up, only use the default reveal if the biometric controller didn't

            // already set it to the circular reveal because we're waking up from a fingerprint/face

            // auth.

            mLightRevealScrim.setRevealEffect(LiftReveal.INSTANCE);

        }

    }