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

Commit baa1249c authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Fix events so that VisualStabilityCoordinator blocks shade recalculation... 

Fix events so that VisualStabilityCoordinator blocks shade recalculation during activity launch animation am: 8b636131 am: c85d40aa

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



Change-Id: I658cd46acdbcb0f53cda5035e80f17c1ca760787
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73dc7515 c85d40aa

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

+2 −2
Original line number Diff line number Diff line
@@ -3377,9 +3377,9 @@ public class NotificationPanelViewController extends PanelViewController { 


    @Override

    public void setIsLaunchAnimationRunning(boolean running) {

        boolean wasRunning = isLaunchTransitionRunning();

        boolean wasRunning = mIsLaunchAnimationRunning;

        super.setIsLaunchAnimationRunning(running);

        if (wasRunning != isLaunchTransitionRunning()) {

        if (wasRunning != mIsLaunchAnimationRunning) {

            mPanelEventsEmitter.notifyLaunchingActivityChanged(running);

        }

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarLaunchAnimatorController.kt

+4 −1
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ class StatusBarLaunchAnimatorController( 


    override fun onIntentStarted(willAnimate: Boolean) {

        delegate.onIntentStarted(willAnimate)

        if (!willAnimate) {

        if (willAnimate) {

            centralSurfaces.notificationPanelViewController.setIsLaunchAnimationRunning(true)

        } else {

            centralSurfaces.collapsePanelOnMainThread()

        }

    }
@@ -51,6 +53,7 @@ class StatusBarLaunchAnimatorController( 


    override fun onLaunchAnimationCancelled() {

        delegate.onLaunchAnimationCancelled()

        centralSurfaces.notificationPanelViewController.setIsLaunchAnimationRunning(false)

        centralSurfaces.onLaunchAnimationCancelled(isLaunchForActivity)

    }

}
 
 No newline at end of file