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

Commit 9ddaf7f8 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 am: 65c089de

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

Change-Id: I57e276b24afe46b2662c3093d7e6d9c964c23cc8
parents d75cbc78 65c089de

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

+5 −1
Original line number Diff line number Diff line
@@ -3965,7 +3965,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);

        }

    }