Merge "Add sysui support for remote transitions in shell transitions" (0d8fac26) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/src/com/android/systemui/shared/recents/ISystemUiProxy.aidl

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,9 +24,11 @@ import android.graphics.Insets;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.os.Bundle;		import android.os.Bundle;
	import android.view.MotionEvent;		import android.view.MotionEvent;
			import android.window.TransitionFilter;

	import com.android.systemui.shared.recents.IPinnedStackAnimationListener;		import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
	import com.android.systemui.shared.recents.model.Task;		import com.android.systemui.shared.recents.model.Task;
			import com.android.systemui.shared.system.RemoteTransitionCompat;

	/**		/**
	* Temporary callbacks into SystemUI.		* Temporary callbacks into SystemUI.
	@@ -192,4 +194,13 @@ interface ISystemUiProxy {
	* @param destinationBounds the destination bounds the PiP window lands into		* @param destinationBounds the destination bounds the PiP window lands into
	*/		*/
	void stopSwipePipToHome(in ComponentName componentName, in Rect destinationBounds) = 31;		void stopSwipePipToHome(in ComponentName componentName, in Rect destinationBounds) = 31;

			/**
			* Registers a RemoteTransitionCompat that will handle transitions. This parameter bundles an
			* IRemoteTransition and a filter that must pass for it.
			*/
			void registerRemoteTransition(in RemoteTransitionCompat remoteTransition) = 32;

			/** Unegisters a RemoteTransitionCompat that will handle transitions. */
			void unregisterRemoteTransition(in RemoteTransitionCompat remoteTransition) = 33;
	}		}

packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,8 @@ public abstract class ActivityOptionsCompat {

	public static ActivityOptions makeRemoteAnimation(		public static ActivityOptions makeRemoteAnimation(
	RemoteAnimationAdapterCompat remoteAnimationAdapter) {		RemoteAnimationAdapterCompat remoteAnimationAdapter) {
	return ActivityOptions.makeRemoteAnimation(remoteAnimationAdapter.getWrapped());		return ActivityOptions.makeRemoteAnimation(remoteAnimationAdapter.getWrapped(),
			remoteAnimationAdapter.getRemoteTransition().getTransition());
	}		}

	public static ActivityOptions makeCustomAnimation(Context context, int enterResId,		public static ActivityOptions makeCustomAnimation(Context context, int enterResId,

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationAdapterCompat.java

+79 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,12 +16,21 @@

	package com.android.systemui.shared.system;		package com.android.systemui.shared.system;

			import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
			import static android.view.WindowManager.TRANSIT_CLOSE;
			import static android.view.WindowManager.TRANSIT_OPEN;
			import static android.view.WindowManager.TRANSIT_TO_BACK;
			import static android.view.WindowManager.TRANSIT_TO_FRONT;

	import android.os.RemoteException;		import android.os.RemoteException;
	import android.util.Log;		import android.util.Log;
	import android.view.IRemoteAnimationFinishedCallback;		import android.view.IRemoteAnimationFinishedCallback;
	import android.view.IRemoteAnimationRunner;		import android.view.IRemoteAnimationRunner;
	import android.view.RemoteAnimationAdapter;		import android.view.RemoteAnimationAdapter;
	import android.view.RemoteAnimationTarget;		import android.view.RemoteAnimationTarget;
			import android.view.SurfaceControl;
			import android.window.IRemoteTransition;
			import android.window.TransitionInfo;

	/**		/**
	* @see RemoteAnimationAdapter		* @see RemoteAnimationAdapter
	@@ -29,17 +38,28 @@ import android.view.RemoteAnimationTarget;
	public class RemoteAnimationAdapterCompat {		public class RemoteAnimationAdapterCompat {

	private final RemoteAnimationAdapter mWrapped;		private final RemoteAnimationAdapter mWrapped;
			private final RemoteTransitionCompat mRemoteTransition;

	public RemoteAnimationAdapterCompat(RemoteAnimationRunnerCompat runner, long duration,		public RemoteAnimationAdapterCompat(RemoteAnimationRunnerCompat runner, long duration,
	long statusBarTransitionDelay) {		long statusBarTransitionDelay) {
	mWrapped = new RemoteAnimationAdapter(wrapRemoteAnimationRunner(runner), duration,		mWrapped = new RemoteAnimationAdapter(wrapRemoteAnimationRunner(runner), duration,
	statusBarTransitionDelay);		statusBarTransitionDelay);
			mRemoteTransition = buildRemoteTransition(runner);
	}		}

	RemoteAnimationAdapter getWrapped() {		RemoteAnimationAdapter getWrapped() {
	return mWrapped;		return mWrapped;
	}		}

			/** Helper to just build a remote transition. Use this if the legacy adapter isn't needed. */
			public static RemoteTransitionCompat buildRemoteTransition(RemoteAnimationRunnerCompat runner) {
			return new RemoteTransitionCompat(wrapRemoteTransition(runner));
			}

			public RemoteTransitionCompat getRemoteTransition() {
			return mRemoteTransition;
			}

	private static IRemoteAnimationRunner.Stub wrapRemoteAnimationRunner(		private static IRemoteAnimationRunner.Stub wrapRemoteAnimationRunner(
	final RemoteAnimationRunnerCompat remoteAnimationAdapter) {		final RemoteAnimationRunnerCompat remoteAnimationAdapter) {
	return new IRemoteAnimationRunner.Stub() {		return new IRemoteAnimationRunner.Stub() {
	@@ -72,4 +92,63 @@ public class RemoteAnimationAdapterCompat {
	}		}
	};		};
	}		}

			private static IRemoteTransition.Stub wrapRemoteTransition(
			final RemoteAnimationRunnerCompat remoteAnimationAdapter) {
			return new IRemoteTransition.Stub() {
			@Override
			public void startAnimation(TransitionInfo info, SurfaceControl.Transaction t,
			IRemoteAnimationFinishedCallback finishCallback) {
			final RemoteAnimationTargetCompat[] appsCompat =
			RemoteAnimationTargetCompat.wrap(info, false /* wallpapers */);
			final RemoteAnimationTargetCompat[] wallpapersCompat =
			RemoteAnimationTargetCompat.wrap(info, true /* wallpapers */);
			final Runnable animationFinishedCallback = new Runnable() {
			@Override
			public void run() {
			try {
			finishCallback.onAnimationFinished();
			} catch (RemoteException e) {
			Log.e("ActivityOptionsCompat", "Failed to call app controlled animation"
			+ " finished callback", e);
			}
			}
			};

			// TODO(b/177438007): Move this set-up logic into launcher's animation impl.
			boolean isReturnToHome = false;
			for (int i = info.getChanges().size() - 1; i >= 0; --i) {
			final TransitionInfo.Change change = info.getChanges().get(i);
			if (change.getTaskInfo() != null
			&& change.getTaskInfo().getActivityType() == ACTIVITY_TYPE_HOME) {
			isReturnToHome = change.getMode() == TRANSIT_OPEN
			\|\| change.getMode() == TRANSIT_TO_FRONT;
			break;
			}
			}

			if (isReturnToHome) {
			// Need to "boost" the closing things since that's what launcher expects.
			for (int i = info.getChanges().size() - 1; i >= 0; --i) {
			final TransitionInfo.Change change = info.getChanges().get(i);
			final SurfaceControl leash = change.getLeash();
			final int mode = info.getChanges().get(i).getMode();
			// Only deal with roots
			if (change.getParent() != null) continue;
			if (mode == TRANSIT_CLOSE \|\| mode == TRANSIT_TO_BACK) {
			t.setLayer(leash, info.getChanges().size() * 3 - i);
			}
			}
			// Make wallpaper visible immediately since launcher apparently won't do this.
			for (int i = wallpapersCompat.length - 1; i >= 0; --i) {
			t.show(wallpapersCompat[i].leash.getSurfaceControl());
			t.setAlpha(wallpapersCompat[i].leash.getSurfaceControl(), 1.f);
			}
			}
			t.apply();
			remoteAnimationAdapter.onAnimationStart(appsCompat, wallpapersCompat,
			animationFinishedCallback);
			}
			};
			}
	}		}

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java

+62 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,10 @@ import android.graphics.Point;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.view.RemoteAnimationTarget;		import android.view.RemoteAnimationTarget;
	import android.view.SurfaceControl;		import android.view.SurfaceControl;
			import android.view.WindowManager;
			import android.window.TransitionInfo;

			import java.util.ArrayList;

	/**		/**
	* @see RemoteAnimationTarget		* @see RemoteAnimationTarget
	@@ -73,6 +77,45 @@ public class RemoteAnimationTargetCompat {
	mStartLeash = app.startLeash;		mStartLeash = app.startLeash;
	}		}

			private static int newModeToLegacyMode(int newMode) {
			switch (newMode) {
			case WindowManager.TRANSIT_OPEN:
			case WindowManager.TRANSIT_TO_FRONT:
			return MODE_OPENING;
			case WindowManager.TRANSIT_CLOSE:
			case WindowManager.TRANSIT_TO_BACK:
			return MODE_CLOSING;
			default:
			return 2; // MODE_CHANGING
			}
			}

			public RemoteAnimationTargetCompat(TransitionInfo.Change change, int order) {
			taskId = change.getTaskInfo() != null ? change.getTaskInfo().taskId : -1;
			mode = newModeToLegacyMode(change.getMode());
			leash = new SurfaceControlCompat(change.getLeash());
			isTranslucent = (change.getFlags() & TransitionInfo.FLAG_TRANSLUCENT) != 0
			\|\| (change.getFlags() & TransitionInfo.FLAG_SHOW_WALLPAPER) != 0;
			clipRect = null;
			position = null;
			localBounds = new Rect(change.getEndAbsBounds());
			localBounds.offsetTo(change.getEndRelOffset().x, change.getEndRelOffset().y);
			sourceContainerBounds = null;
			screenSpaceBounds = change.getEndAbsBounds();
			prefixOrderIndex = order;
			// TODO(shell-transitions): I guess we need to send content insets? evaluate how its used.
			contentInsets = new Rect(0, 0, 0, 0);
			if (change.getTaskInfo() != null) {
			isNotInRecents = !change.getTaskInfo().isRunning;
			activityType = change.getTaskInfo().getActivityType();
			} else {
			isNotInRecents = true;
			activityType = ACTIVITY_TYPE_UNDEFINED;
			}
			pictureInPictureParams = null;
			mStartLeash = null;
			}

	public static RemoteAnimationTargetCompat[] wrap(RemoteAnimationTarget[] apps) {		public static RemoteAnimationTargetCompat[] wrap(RemoteAnimationTarget[] apps) {
	final RemoteAnimationTargetCompat[] appsCompat =		final RemoteAnimationTargetCompat[] appsCompat =
	new RemoteAnimationTargetCompat[apps != null ? apps.length : 0];		new RemoteAnimationTargetCompat[apps != null ? apps.length : 0];
	@@ -82,6 +125,24 @@ public class RemoteAnimationTargetCompat {
	return appsCompat;		return appsCompat;
	}		}

			/**
			* Represents a TransitionInfo object as an array of old-style targets
			*
			* @param wallpapers If true, this will return wallpaper targets; otherwise it returns
			* non-wallpaper targets.
			*/
			public static RemoteAnimationTargetCompat[] wrap(TransitionInfo info, boolean wallpapers) {
			final ArrayList<RemoteAnimationTargetCompat> out = new ArrayList<>();
			for (int i = 0; i < info.getChanges().size(); i++) {
			boolean changeIsWallpaper =
			(info.getChanges().get(i).getFlags() & TransitionInfo.FLAG_IS_WALLPAPER) != 0;
			if (wallpapers != changeIsWallpaper) continue;
			out.add(new RemoteAnimationTargetCompat(info.getChanges().get(i),
			info.getChanges().size() - i));
			}
			return out.toArray(new RemoteAnimationTargetCompat[out.size()]);
			}

	/**		/**
	* @see SurfaceControl#release()		* @see SurfaceControl#release()
	*/		*/

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteTransitionCompat.aidl

0 → 100644

+19 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2020 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.systemui.shared.system;

			parcelable RemoteTransitionCompat;