Merge "Passthrough animation handoff method for RecentsAnimationControllerCompat." into main (51c0963d) · Commits · e / os / android_frameworks_base

packages/SystemUI/animation/src/com/android/systemui/animation/TransitionAnimator.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -114,16 +114,16 @@ class TransitionAnimator(
		)
		}

		internal fun assertReturnAnimations() {
		fun assertReturnAnimations() {
		check(returnAnimationsEnabled()) {
		"isLaunching cannot be false when the returnAnimationFrameworkLibrary flag " +
		"is disabled"
		}
		}

		internal fun returnAnimationsEnabled() = returnAnimationFrameworkLibrary()
		fun returnAnimationsEnabled() = returnAnimationFrameworkLibrary()

		internal fun assertLongLivedReturnAnimations() {
		fun assertLongLivedReturnAnimations() {
		check(longLivedReturnAnimationsEnabled()) {
		"Long-lived registrations cannot be used when the " +
		"returnAnimationFrameworkLibrary or the " +
		@@ -131,7 +131,7 @@ class TransitionAnimator(
		}
		}

		internal fun longLivedReturnAnimationsEnabled() =
		fun longLivedReturnAnimationsEnabled() =
		returnAnimationFrameworkLibrary() && returnAnimationFrameworkLongLived()

		internal fun WindowAnimationState.toTransitionState() =

+13 −0

Original line number	Diff line number	Diff line
		@@ -18,9 +18,11 @@ package com.android.systemui.shared.system;

		import android.os.RemoteException;
		import android.util.Log;
		import android.view.RemoteAnimationTarget;
		import android.view.SurfaceControl;
		import android.window.PictureInPictureSurfaceTransaction;
		import android.window.TaskSnapshot;
		import android.window.WindowAnimationState;

		import com.android.internal.os.IResultReceiver;
		import com.android.systemui.shared.recents.model.ThumbnailData;
		@@ -106,6 +108,17 @@ public class RecentsAnimationControllerCompat {
		}
		}

		/**
		* @see IRecentsAnimationController#handOffAnimation
		*/
		public void handOffAnimation(RemoteAnimationTarget[] targets, WindowAnimationState[] states) {
		try {
		mAnimationController.handOffAnimation(targets, states);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to hand off animation", e);
		}
		}

		/**
		* @see IRecentsAnimationController#detachNavigationBarFromApp
		*/