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

Commit 1e658dd4 authored Jun 29, 2022 by Issei Suzuki Committed by Automerger Merge Worker Jun 29, 2022

Pass keyguard occluded status in onAnimationCancelled. am: c77d9bda am: 3515a406

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

Change-Id: I8562863dfd5350360a12a033db121c5c173c44ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents adaef5c4 3515a406

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);
		}

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentAnimationRunner.java

+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);
		}

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+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);
		}

libs/WindowManager/Shell/src/com/android/wm/shell/stagesplit/StageCoordinator.java

+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);
		}

libs/WindowManager/Shell/src/com/android/wm/shell/transition/LegacyTransitions.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ public class LegacyTransitions {
		}

		@Override
		public void onAnimationCancelled() throws RemoteException {
		public void onAnimationCancelled(boolean isKeyguardOccluded) throws RemoteException {
		mCancelled = true;
		mApps = mWallpapers = mNonApps = null;
		checkApply();