Merge cherrypicks of [18918932, 18976454, 19119508, 19043499, 19043505] into tm-release. (4e647a7f) · Commits · e / os / android_frameworks_base

core/java/android/view/IRemoteAnimationRunner.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,5 +46,5 @@ oneway interface IRemoteAnimationRunner {
		* won't have any effect anymore.
		*/
		@UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
		void onAnimationCancelled();
		void onAnimationCancelled(boolean isKeyguardOccluded);
		}

+12 −4

Original line number	Diff line number	Diff line
		@@ -2802,10 +2802,6 @@ public final class ViewRootImpl implements ViewParent,
		// Execute enqueued actions on every traversal in case a detached view enqueued an action
		getRunQueue().executeActions(mAttachInfo.mHandler);

		if (mApplyInsetsRequested) {
		dispatchApplyInsets(host);
		}

		if (mFirst) {
		// make sure touch mode code executes by setting cached value
		// to opposite of the added touch mode.
		@@ -2869,6 +2865,18 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		if (mApplyInsetsRequested) {
		dispatchApplyInsets(host);
		if (mLayoutRequested) {
		// Short-circuit catching a new layout request here, so
		// we don't need to go through two layout passes when things
		// change due to fitting system windows, which can happen a lot.
		windowSizeMayChange \|= measureHierarchy(host, lp,
		mView.getContext().getResources(),
		desiredWindowWidth, desiredWindowHeight);
		}
		}

		if (layoutRequested) {
		// Clear this now, so that if anything requests a layout in the
		// rest of this function we will catch it and re-run a full

+2 −2

Original line number	Diff line number	Diff line
		@@ -83,9 +83,9 @@ class TaskFragmentAnimationRunner extends IRemoteAnimationRunner.Stub {
		}

		@Override
		public void onAnimationCancelled() {
		public void onAnimationCancelled(boolean isKeyguardOccluded) {
		if (TaskFragmentAnimationController.DEBUG) {
		Log.v(TAG, "onAnimationCancelled");
		Log.v(TAG, "onAnimationCancelled: isKeyguardOccluded=" + isKeyguardOccluded);
		}
		mHandler.post(this::cancelAnimation);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -456,10 +456,10 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		}

		@Override
		public void onAnimationCancelled() {
		public void onAnimationCancelled(boolean isKeyguardOccluded) {
		onRemoteAnimationFinishedOrCancelled(evictWct);
		try {
		adapter.getRunner().onAnimationCancelled();
		adapter.getRunner().onAnimationCancelled(isKeyguardOccluded);
		} catch (RemoteException e) {
		Slog.e(TAG, "Error starting remote animation", e);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -345,9 +345,9 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		}

		@Override
		public void onAnimationCancelled() {
		public void onAnimationCancelled(boolean isKeyguardOccluded) {
		try {
		adapter.getRunner().onAnimationCancelled();
		adapter.getRunner().onAnimationCancelled(isKeyguardOccluded);
		} catch (RemoteException e) {
		Slog.e(TAG, "Error starting remote animation", e);
		}