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

Commit 8b636131 authored May 09, 2022 by Jeff DeCew

Fix events so that VisualStabilityCoordinator blocks shade recalculation...

Fix events so that VisualStabilityCoordinator blocks shade recalculation during activity launch animation

Bug: 230540148
Bug: 227254780
Test: atest VisualStabilityCoordinatorTest
Change-Id: Iacb95f8be09acf31faea7f71c4580dbb9fdc0825

parent 221212c6

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

+2 −2

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

	@Override		@Override
	public void setIsLaunchAnimationRunning(boolean running) {		public void setIsLaunchAnimationRunning(boolean running) {
	boolean wasRunning = isLaunchTransitionRunning();		boolean wasRunning = mIsLaunchAnimationRunning;
	super.setIsLaunchAnimationRunning(running);		super.setIsLaunchAnimationRunning(running);
	if (wasRunning != isLaunchTransitionRunning()) {		if (wasRunning != mIsLaunchAnimationRunning) {
	mPanelEventsEmitter.notifyLaunchingActivityChanged(running);		mPanelEventsEmitter.notifyLaunchingActivityChanged(running);
	}		}
	}		}

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

+4 −1

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

	override fun onIntentStarted(willAnimate: Boolean) {		override fun onIntentStarted(willAnimate: Boolean) {
	delegate.onIntentStarted(willAnimate)		delegate.onIntentStarted(willAnimate)
	if (!willAnimate) {		if (willAnimate) {
			centralSurfaces.notificationPanelViewController.setIsLaunchAnimationRunning(true)
			} else {
	centralSurfaces.collapsePanelOnMainThread()		centralSurfaces.collapsePanelOnMainThread()
	}		}
	}		}
	@@ -51,6 +53,7 @@ class StatusBarLaunchAnimatorController(

	override fun onLaunchAnimationCancelled() {		override fun onLaunchAnimationCancelled() {
	delegate.onLaunchAnimationCancelled()		delegate.onLaunchAnimationCancelled()
			centralSurfaces.notificationPanelViewController.setIsLaunchAnimationRunning(false)
	centralSurfaces.onLaunchAnimationCancelled(isLaunchForActivity)		centralSurfaces.onLaunchAnimationCancelled(isLaunchForActivity)
	}		}
	}		}
			No newline at end of file