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

Commit dfae8074 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bring back circle reveal from AOD" into sc-dev am: f0082ed1 am: e5ee5d3b 

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

Change-Id: I28ba7c60285d7a530663b6102a989ff8287290da
parents 11161b43 e5ee5d3b

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

+2 −5
Original line number Diff line number Diff line
@@ -3521,10 +3521,10 @@ public class StatusBar extends SystemUI implements DemoMode, 
    public void fadeKeyguardWhilePulsing() {

        mNotificationPanelViewController.fadeOut(0, FADE_KEYGUARD_DURATION_PULSING,

                ()-> {

                hideKeyguard();

                if (shouldShowCircleReveal()) {

                    startCircleReveal();

                }

                hideKeyguard();

                mStatusBarKeyguardViewManager.onKeyguardFadedAway();

            }).start();

    }
@@ -3882,9 +3882,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        updateQsExpansionEnabled();

        mKeyguardViewMediator.setDozing(mDozing);



        if (!isDozing && shouldShowCircleReveal()) {

            startCircleReveal();

        } else if ((isDozing && mWakefulnessLifecycle.getLastSleepReason()

        if ((isDozing && mWakefulnessLifecycle.getLastSleepReason()

                == PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON)

                || (!isDozing && mWakefulnessLifecycle.getLastWakeReason()

                == PowerManager.WAKE_REASON_POWER_BUTTON)) {
@@ -4897,7 +4895,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
        if (mFeatureFlags.useNewLockscreenAnimations()

                && (mDozeParameters.getAlwaysOn() || mDozeParameters.isQuickPickupEnabled())) {

            mLightRevealScrim.setVisibility(View.VISIBLE);

            mLightRevealScrim.setRevealEffect(LiftReveal.INSTANCE);

        } else {

            mLightRevealScrim.setVisibility(View.GONE);

        }