Merge "Removing RemoteTransitionCompat and related wrappers" (d369191e) · Commits · e / os / android_frameworks_base

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.os.UserHandle;
		import android.view.MotionEvent;

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

		/**
		* Temporary callbacks into SystemUI.

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

deleted100644 → 0

+0 −258

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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;

		import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
		import static android.view.WindowManager.TRANSIT_CLOSE;
		import static android.view.WindowManager.TRANSIT_OLD_NONE;
		import static android.view.WindowManager.TRANSIT_OPEN;
		import static android.view.WindowManager.TRANSIT_TO_BACK;
		import static android.view.WindowManager.TRANSIT_TO_FRONT;
		import static android.view.WindowManager.TransitionOldType;
		import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;

		import android.annotation.SuppressLint;
		import android.app.IApplicationThread;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.util.ArrayMap;
		import android.util.Log;
		import android.view.IRemoteAnimationFinishedCallback;
		import android.view.IRemoteAnimationRunner;
		import android.view.RemoteAnimationAdapter;
		import android.view.RemoteAnimationTarget;
		import android.view.SurfaceControl;
		import android.window.IRemoteTransition;
		import android.window.IRemoteTransitionFinishedCallback;
		import android.window.RemoteTransition;
		import android.window.TransitionInfo;

		import com.android.wm.shell.util.CounterRotator;

		/**
		* @see RemoteAnimationAdapter
		*/
		public class RemoteAnimationAdapterCompat {

		private final RemoteAnimationAdapter mWrapped;
		private final RemoteTransitionCompat mRemoteTransition;

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

		public RemoteAnimationAdapter getWrapped() {
		return mWrapped;
		}

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

		public RemoteTransitionCompat getRemoteTransition() {
		return mRemoteTransition;
		}

		/** Wraps a RemoteAnimationRunnerCompat in an IRemoteAnimationRunner. */
		public static IRemoteAnimationRunner.Stub wrapRemoteAnimationRunner(
		final RemoteAnimationRunnerCompat remoteAnimationAdapter) {
		return new IRemoteAnimationRunner.Stub() {
		@Override
		public void onAnimationStart(@TransitionOldType int transit,
		RemoteAnimationTarget[] apps,
		RemoteAnimationTarget[] wallpapers,
		RemoteAnimationTarget[] nonApps,
		final IRemoteAnimationFinishedCallback finishedCallback) {
		final Runnable animationFinishedCallback = new Runnable() {
		@Override
		public void run() {
		try {
		finishedCallback.onAnimationFinished();
		} catch (RemoteException e) {
		Log.e("ActivityOptionsCompat", "Failed to call app controlled animation"
		+ " finished callback", e);
		}
		}
		};
		remoteAnimationAdapter.onAnimationStart(transit, apps, wallpapers,
		nonApps, animationFinishedCallback);
		}

		@Override
		public void onAnimationCancelled(boolean isKeyguardOccluded) {
		remoteAnimationAdapter.onAnimationCancelled();
		}
		};
		}

		private static IRemoteTransition.Stub wrapRemoteTransition(
		final RemoteAnimationRunnerCompat remoteAnimationAdapter) {
		return new IRemoteTransition.Stub() {
		final ArrayMap<IBinder, Runnable> mFinishRunnables = new ArrayMap<>();

		@Override
		public void startAnimation(IBinder token, TransitionInfo info,
		SurfaceControl.Transaction t,
		IRemoteTransitionFinishedCallback finishCallback) {
		final ArrayMap<SurfaceControl, SurfaceControl> leashMap = new ArrayMap<>();
		final RemoteAnimationTarget[] apps =
		RemoteAnimationTargetCompat.wrapApps(info, t, leashMap);
		final RemoteAnimationTarget[] wallpapers =
		RemoteAnimationTargetCompat.wrapNonApps(
		info, true /* wallpapers */, t, leashMap);
		final RemoteAnimationTarget[] nonApps =
		RemoteAnimationTargetCompat.wrapNonApps(
		info, false /* wallpapers */, t, leashMap);

		// TODO(b/177438007): Move this set-up logic into launcher's animation impl.
		boolean isReturnToHome = false;
		TransitionInfo.Change launcherTask = null;
		TransitionInfo.Change wallpaper = null;
		int launcherLayer = 0;
		int rotateDelta = 0;
		float displayW = 0;
		float displayH = 0;
		for (int i = info.getChanges().size() - 1; i >= 0; --i) {
		final TransitionInfo.Change change = info.getChanges().get(i);
		// skip changes that we didn't wrap
		if (!leashMap.containsKey(change.getLeash())) continue;
		if (change.getTaskInfo() != null
		&& change.getTaskInfo().getActivityType() == ACTIVITY_TYPE_HOME) {
		isReturnToHome = change.getMode() == TRANSIT_OPEN
		\|\| change.getMode() == TRANSIT_TO_FRONT;
		launcherTask = change;
		launcherLayer = info.getChanges().size() - i;
		} else if ((change.getFlags() & FLAG_IS_WALLPAPER) != 0) {
		wallpaper = change;
		}
		if (change.getParent() == null && change.getEndRotation() >= 0
		&& change.getEndRotation() != change.getStartRotation()) {
		rotateDelta = change.getEndRotation() - change.getStartRotation();
		displayW = change.getEndAbsBounds().width();
		displayH = change.getEndAbsBounds().height();
		}
		}

		// Prepare for rotation if there is one
		final CounterRotator counterLauncher = new CounterRotator();
		final CounterRotator counterWallpaper = new CounterRotator();
		if (launcherTask != null && rotateDelta != 0 && launcherTask.getParent() != null) {
		counterLauncher.setup(t, info.getChange(launcherTask.getParent()).getLeash(),
		rotateDelta, displayW, displayH);
		if (counterLauncher.getSurface() != null) {
		t.setLayer(counterLauncher.getSurface(), launcherLayer);
		}
		}

		if (isReturnToHome) {
		if (counterLauncher.getSurface() != null) {
		t.setLayer(counterLauncher.getSurface(), info.getChanges().size() * 3);
		}
		// 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 = leashMap.get(change.getLeash());
		// skip changes that we didn't wrap
		if (leash == null) continue;
		final int mode = info.getChanges().get(i).getMode();
		// Only deal with independent layers
		if (!TransitionInfo.isIndependent(change, info)) continue;
		if (mode == TRANSIT_CLOSE \|\| mode == TRANSIT_TO_BACK) {
		t.setLayer(leash, info.getChanges().size() * 3 - i);
		counterLauncher.addChild(t, leash);
		}
		}
		// Make wallpaper visible immediately since launcher apparently won't do this.
		for (int i = wallpapers.length - 1; i >= 0; --i) {
		t.show(wallpapers[i].leash);
		t.setAlpha(wallpapers[i].leash, 1.f);
		}
		} else {
		if (launcherTask != null) {
		counterLauncher.addChild(t, leashMap.get(launcherTask.getLeash()));
		}
		if (wallpaper != null && rotateDelta != 0 && wallpaper.getParent() != null) {
		counterWallpaper.setup(t, info.getChange(wallpaper.getParent()).getLeash(),
		rotateDelta, displayW, displayH);
		if (counterWallpaper.getSurface() != null) {
		t.setLayer(counterWallpaper.getSurface(), -1);
		counterWallpaper.addChild(t, leashMap.get(wallpaper.getLeash()));
		}
		}
		}
		t.apply();

		final Runnable animationFinishedCallback = new Runnable() {
		@Override
		@SuppressLint("NewApi")
		public void run() {
		final SurfaceControl.Transaction finishTransaction =
		new SurfaceControl.Transaction();
		counterLauncher.cleanUp(finishTransaction);
		counterWallpaper.cleanUp(finishTransaction);
		// Release surface references now. This is apparently to free GPU memory
		// while doing quick operations (eg. during CTS).
		for (int i = info.getChanges().size() - 1; i >= 0; --i) {
		info.getChanges().get(i).getLeash().release();
		}
		// Don't release here since launcher might still be using them. Instead
		// let launcher release them (eg. via RemoteAnimationTargets)
		leashMap.clear();
		try {
		finishCallback.onTransitionFinished(null /* wct */, finishTransaction);
		} catch (RemoteException e) {
		Log.e("ActivityOptionsCompat", "Failed to call app controlled animation"
		+ " finished callback", e);
		}
		}
		};
		synchronized (mFinishRunnables) {
		mFinishRunnables.put(token, animationFinishedCallback);
		}
		// TODO(bc-unlcok): Pass correct transit type.
		remoteAnimationAdapter.onAnimationStart(TRANSIT_OLD_NONE,
		apps, wallpapers, nonApps, () -> {
		synchronized (mFinishRunnables) {
		if (mFinishRunnables.remove(token) == null) return;
		}
		animationFinishedCallback.run();
		});
		}

		@Override
		public void mergeAnimation(IBinder token, TransitionInfo info,
		SurfaceControl.Transaction t, IBinder mergeTarget,
		IRemoteTransitionFinishedCallback finishCallback) {
		// TODO: hook up merge to recents onTaskAppeared if applicable. Until then, adapt
		// to legacy cancel.
		final Runnable finishRunnable;
		synchronized (mFinishRunnables) {
		finishRunnable = mFinishRunnables.remove(mergeTarget);
		}
		if (finishRunnable == null) return;
		remoteAnimationAdapter.onAnimationCancelled();
		finishRunnable.run();
		}
		};
		}
		}

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

deleted100644 → 0

+0 −40

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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;

		import android.view.RemoteAnimationDefinition;

		/**
		* @see RemoteAnimationDefinition
		*/
		public class RemoteAnimationDefinitionCompat {

		private final RemoteAnimationDefinition mWrapped = new RemoteAnimationDefinition();

		public void addRemoteAnimation(int transition, RemoteAnimationAdapterCompat adapter) {
		mWrapped.addRemoteAnimation(transition, adapter.getWrapped());
		}

		public void addRemoteAnimation(int transition, int activityTypeFilter,
		RemoteAnimationAdapterCompat adapter) {
		mWrapped.addRemoteAnimation(transition, activityTypeFilter, adapter.getWrapped());
		}

		public RemoteAnimationDefinition getWrapped() {
		return mWrapped;
		}
		}

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

+188 −3

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

		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_OLD_NONE;
		import static android.view.WindowManager.TRANSIT_OPEN;
		import static android.view.WindowManager.TRANSIT_TO_BACK;
		import static android.view.WindowManager.TRANSIT_TO_FRONT;
		import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;

		import android.os.IBinder;
		import android.os.RemoteException;
		import android.util.ArrayMap;
		import android.util.Log;
		import android.view.IRemoteAnimationFinishedCallback;
		import android.view.IRemoteAnimationRunner;
		import android.view.RemoteAnimationTarget;
		import android.view.SurfaceControl;
		import android.view.WindowManager;
		import android.view.WindowManager.TransitionOldType;
		import android.window.IRemoteTransition;
		import android.window.IRemoteTransitionFinishedCallback;
		import android.window.TransitionInfo;

		import com.android.wm.shell.util.CounterRotator;

		public abstract class RemoteAnimationRunnerCompat extends IRemoteAnimationRunner.Stub {

		public interface RemoteAnimationRunnerCompat {
		void onAnimationStart(@WindowManager.TransitionOldType int transit,
		public abstract void onAnimationStart(@WindowManager.TransitionOldType int transit,
		RemoteAnimationTarget[] apps, RemoteAnimationTarget[] wallpapers,
		RemoteAnimationTarget[] nonApps, Runnable finishedCallback);
		void onAnimationCancelled();

		@Override
		public final void onAnimationStart(@TransitionOldType int transit,
		RemoteAnimationTarget[] apps,
		RemoteAnimationTarget[] wallpapers,
		RemoteAnimationTarget[] nonApps,
		final IRemoteAnimationFinishedCallback finishedCallback) {

		onAnimationStart(transit, apps, wallpapers,
		nonApps, () -> {
		try {
		finishedCallback.onAnimationFinished();
		} catch (RemoteException e) {
		Log.e("ActivityOptionsCompat", "Failed to call app controlled animation"
		+ " finished callback", e);
		}
		});
		}

		public IRemoteTransition toRemoteTransition() {
		return new IRemoteTransition.Stub() {
		final ArrayMap<IBinder, Runnable> mFinishRunnables = new ArrayMap<>();

		@Override
		public void startAnimation(IBinder token, TransitionInfo info,
		SurfaceControl.Transaction t,
		IRemoteTransitionFinishedCallback finishCallback) {
		final ArrayMap<SurfaceControl, SurfaceControl> leashMap = new ArrayMap<>();
		final RemoteAnimationTarget[] apps =
		RemoteAnimationTargetCompat.wrapApps(info, t, leashMap);
		final RemoteAnimationTarget[] wallpapers =
		RemoteAnimationTargetCompat.wrapNonApps(
		info, true /* wallpapers */, t, leashMap);
		final RemoteAnimationTarget[] nonApps =
		RemoteAnimationTargetCompat.wrapNonApps(
		info, false /* wallpapers */, t, leashMap);

		// TODO(b/177438007): Move this set-up logic into launcher's animation impl.
		boolean isReturnToHome = false;
		TransitionInfo.Change launcherTask = null;
		TransitionInfo.Change wallpaper = null;
		int launcherLayer = 0;
		int rotateDelta = 0;
		float displayW = 0;
		float displayH = 0;
		for (int i = info.getChanges().size() - 1; i >= 0; --i) {
		final TransitionInfo.Change change = info.getChanges().get(i);
		// skip changes that we didn't wrap
		if (!leashMap.containsKey(change.getLeash())) continue;
		if (change.getTaskInfo() != null
		&& change.getTaskInfo().getActivityType() == ACTIVITY_TYPE_HOME) {
		isReturnToHome = change.getMode() == TRANSIT_OPEN
		\|\| change.getMode() == TRANSIT_TO_FRONT;
		launcherTask = change;
		launcherLayer = info.getChanges().size() - i;
		} else if ((change.getFlags() & FLAG_IS_WALLPAPER) != 0) {
		wallpaper = change;
		}
		if (change.getParent() == null && change.getEndRotation() >= 0
		&& change.getEndRotation() != change.getStartRotation()) {
		rotateDelta = change.getEndRotation() - change.getStartRotation();
		displayW = change.getEndAbsBounds().width();
		displayH = change.getEndAbsBounds().height();
		}
		}

		// Prepare for rotation if there is one
		final CounterRotator counterLauncher = new CounterRotator();
		final CounterRotator counterWallpaper = new CounterRotator();
		if (launcherTask != null && rotateDelta != 0 && launcherTask.getParent() != null) {
		counterLauncher.setup(t, info.getChange(launcherTask.getParent()).getLeash(),
		rotateDelta, displayW, displayH);
		if (counterLauncher.getSurface() != null) {
		t.setLayer(counterLauncher.getSurface(), launcherLayer);
		}
		}

		if (isReturnToHome) {
		if (counterLauncher.getSurface() != null) {
		t.setLayer(counterLauncher.getSurface(), info.getChanges().size() * 3);
		}
		// 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 = leashMap.get(change.getLeash());
		// skip changes that we didn't wrap
		if (leash == null) continue;
		final int mode = info.getChanges().get(i).getMode();
		// Only deal with independent layers
		if (!TransitionInfo.isIndependent(change, info)) continue;
		if (mode == TRANSIT_CLOSE \|\| mode == TRANSIT_TO_BACK) {
		t.setLayer(leash, info.getChanges().size() * 3 - i);
		counterLauncher.addChild(t, leash);
		}
		}
		// Make wallpaper visible immediately since launcher apparently won't do this.
		for (int i = wallpapers.length - 1; i >= 0; --i) {
		t.show(wallpapers[i].leash);
		t.setAlpha(wallpapers[i].leash, 1.f);
		}
		} else {
		if (launcherTask != null) {
		counterLauncher.addChild(t, leashMap.get(launcherTask.getLeash()));
		}
		if (wallpaper != null && rotateDelta != 0 && wallpaper.getParent() != null) {
		counterWallpaper.setup(t, info.getChange(wallpaper.getParent()).getLeash(),
		rotateDelta, displayW, displayH);
		if (counterWallpaper.getSurface() != null) {
		t.setLayer(counterWallpaper.getSurface(), -1);
		counterWallpaper.addChild(t, leashMap.get(wallpaper.getLeash()));
		}
		}
		}
		t.apply();

		final Runnable animationFinishedCallback = () -> {
		final SurfaceControl.Transaction finishTransaction =
		new SurfaceControl.Transaction();
		counterLauncher.cleanUp(finishTransaction);
		counterWallpaper.cleanUp(finishTransaction);
		// Release surface references now. This is apparently to free GPU memory
		// while doing quick operations (eg. during CTS).
		for (int i = info.getChanges().size() - 1; i >= 0; --i) {
		info.getChanges().get(i).getLeash().release();
		}
		// Don't release here since launcher might still be using them. Instead
		// let launcher release them (eg. via RemoteAnimationTargets)
		leashMap.clear();
		try {
		finishCallback.onTransitionFinished(null /* wct */, finishTransaction);
		} catch (RemoteException e) {
		Log.e("ActivityOptionsCompat", "Failed to call app controlled animation"
		+ " finished callback", e);
		}
		};
		synchronized (mFinishRunnables) {
		mFinishRunnables.put(token, animationFinishedCallback);
		}
		// TODO(bc-unlcok): Pass correct transit type.
		onAnimationStart(TRANSIT_OLD_NONE,
		apps, wallpapers, nonApps, () -> {
		synchronized (mFinishRunnables) {
		if (mFinishRunnables.remove(token) == null) return;
		}
		animationFinishedCallback.run();
		});
		}

		@Override
		public void mergeAnimation(IBinder token, TransitionInfo info,
		SurfaceControl.Transaction t, IBinder mergeTarget,
		IRemoteTransitionFinishedCallback finishCallback) throws RemoteException {
		// TODO: hook up merge to recents onTaskAppeared if applicable. Until then, adapt
		// to legacy cancel.
		final Runnable finishRunnable;
		synchronized (mFinishRunnables) {
		finishRunnable = mFinishRunnables.remove(mergeTarget);
		}
		if (finishRunnable == null) return;
		onAnimationCancelled(false /* isKeyguardOccluded */);
		finishRunnable.run();
		}
		};
		}
		}
		No newline at end of file

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

deleted100644 → 0

+0 −19

File deleted.

Preview size limit exceeded, changes collapsed.