Merge "Fixing TaskView.launchTask.onEndCallback is not called" into sc-dev am: eb3367796a (9ffb0f80) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -423,7 +423,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
		public ActivityOptionsWrapper getActivityLaunchOptions(View v, @Nullable ItemInfo item) {
		ActivityOptionsWrapper activityOptions =
		mAppTransitionManager.hasControlRemoteAppTransitionPermission()
		? mAppTransitionManager.getActivityLaunchOptions(this, v)
		? mAppTransitionManager.getActivityLaunchOptions(v)
		: super.getActivityLaunchOptions(v, item);
		if (mLastTouchUpTime > 0) {
		ActivityOptionsCompat.setLauncherSourceInfo(

quickstep/src/com/android/launcher3/LauncherAnimationRunner.java

+62 −20

Original line number	Diff line number	Diff line
		@@ -36,26 +36,48 @@ import androidx.annotation.UiThread;
		import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

		import java.lang.ref.WeakReference;

		/**
		* This class is needed to wrap any animation runner that is a part of the
		* RemoteAnimationDefinition:
		* - Launcher creates a new instance of the LauncherAppTransitionManagerImpl whenever it is
		* created, which in turn registers a new definition
		* - When the definition is registered, window manager retains a strong binder reference to the
		* runner passed in
		* - If the Launcher activity is recreated, the new definition registered will replace the old
		* reference in the system's activity record, but until the system server is GC'd, the binder
		* reference will still exist, which references the runner in the Launcher process, which
		* references the (old) Launcher activity through this class
		*
		* Instead we make the runner provided to the definition static only holding a weak reference to
		* the runner implementation. When this animation manager is destroyed, we remove the Launcher
		* reference to the runner, leaving only the weak ref from the runner.
		*/
		@TargetApi(Build.VERSION_CODES.P)
		public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat {
		public class LauncherAnimationRunner implements RemoteAnimationRunnerCompat {

		private static final RemoteAnimationFactory DEFAULT_FACTORY =
		(transit, appTargets, wallpaperTargets, nonAppTargets, result) ->
		result.setAnimation(null, null);

		private final Handler mHandler;
		private final boolean mStartAtFrontOfQueue;
		private final WeakReference<RemoteAnimationFactory> mFactory;

		private AnimationResult mAnimationResult;

		/**
		* @param startAtFrontOfQueue If true, the animation start will be posted at the front of the
		* queue to minimize latency.
		*/
		public LauncherAnimationRunner(Handler handler, boolean startAtFrontOfQueue) {
		public LauncherAnimationRunner(Handler handler, RemoteAnimationFactory factory,
		boolean startAtFrontOfQueue) {
		mHandler = handler;
		mFactory = new WeakReference<>(factory);
		mStartAtFrontOfQueue = startAtFrontOfQueue;
		}

		public Handler getHandler() {
		return mHandler;
		}

		// Called only in S+ platform
		@BinderThread
		public void onAnimationStart(
		@@ -67,7 +89,7 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
		Runnable r = () -> {
		finishExistingAnimation();
		mAnimationResult = new AnimationResult(() -> mAnimationResult = null, runnable);
		onCreateAnimation(transit, appTargets, wallpaperTargets, nonAppTargets,
		getFactory().onCreateAnimation(transit, appTargets, wallpaperTargets, nonAppTargets,
		mAnimationResult);
		};
		if (mStartAtFrontOfQueue) {
		@@ -92,17 +114,11 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
		onAnimationStart(appTargets, new RemoteAnimationTargetCompat[0], runnable);
		}

		/**
		* Called on the UI thread when the animation targets are received. The implementation must
		* call {@link AnimationResult#setAnimation} with the target animation to be run.
		*/
		@UiThread
		public abstract void onCreateAnimation(
		int transit,
		RemoteAnimationTargetCompat[] appTargets,
		RemoteAnimationTargetCompat[] wallpaperTargets,
		RemoteAnimationTargetCompat[] nonAppTargets,
		AnimationResult result);

		private RemoteAnimationFactory getFactory() {
		RemoteAnimationFactory factory = mFactory.get();
		return factory != null ? factory : DEFAULT_FACTORY;
		}

		@UiThread
		private void finishExistingAnimation() {
		@@ -118,7 +134,10 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
		@BinderThread
		@Override
		public void onAnimationCancelled() {
		postAsyncCallback(mHandler, this::finishExistingAnimation);
		postAsyncCallback(mHandler, () -> {
		finishExistingAnimation();
		getFactory().onAnimationCancelled();
		});
		}

		public static final class AnimationResult {
		@@ -153,7 +172,6 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
		@UiThread
		public void setAnimation(AnimatorSet animation, Context context) {
		setAnimation(animation, context, null, true);

		}

		/**
		@@ -198,4 +216,28 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
		}
		}
		}

		/**
		* Used with LauncherAnimationRunner as an interface for the runner to call back to the
		* implementation.
		*/
		@FunctionalInterface
		public interface RemoteAnimationFactory {

		/**
		* Called on the UI thread when the animation targets are received. The implementation must
		* call {@link AnimationResult#setAnimation} with the target animation to be run.
		*/
		void onCreateAnimation(int transit,
		RemoteAnimationTargetCompat[] appTargets,
		RemoteAnimationTargetCompat[] wallpaperTargets,
		RemoteAnimationTargetCompat[] nonAppTargets,
		LauncherAnimationRunner.AnimationResult result);

		/**
		* Called when the animation is cancelled. This can happen with or without
		* the create being called.
		*/
		default void onAnimationCancelled() { }
		}
		}

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+20 −19

Original line number	Diff line number	Diff line
		@@ -79,6 +79,7 @@ import androidx.annotation.Nullable;
		import androidx.core.graphics.ColorUtils;

		import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
		import com.android.launcher3.LauncherAnimationRunner.RemoteAnimationFactory;
		import com.android.launcher3.anim.AnimationSuccessListener;
		import com.android.launcher3.dragndrop.DragLayer;
		import com.android.launcher3.icons.FastBitmapDrawable;
		@@ -197,11 +198,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener

		private RemoteAnimationProvider mRemoteAnimationProvider;
		// Strong refs to runners which are cleared when the launcher activity is destroyed
		private WrappedAnimationRunnerImpl mWallpaperOpenRunner;
		private WrappedAnimationRunnerImpl mAppLaunchRunner;
		private WrappedAnimationRunnerImpl mKeyguardGoingAwayRunner;
		private RemoteAnimationFactory mWallpaperOpenRunner;
		private RemoteAnimationFactory mAppLaunchRunner;
		private RemoteAnimationFactory mKeyguardGoingAwayRunner;

		private WrappedAnimationRunnerImpl mWallpaperOpenTransitionRunner;
		private RemoteAnimationFactory mWallpaperOpenTransitionRunner;
		private RemoteTransitionCompat mLauncherOpenTransition;

		private final AnimatorListenerAdapter mForceInvisibleListener = new AnimatorListenerAdapter() {
		@@ -257,11 +258,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		* @return ActivityOptions with remote animations that controls how the window of the opening
		* targets are displayed.
		*/
		public ActivityOptionsWrapper getActivityLaunchOptions(Launcher launcher, View v) {
		public ActivityOptionsWrapper getActivityLaunchOptions(View v) {
		boolean fromRecents = isLaunchingFromRecents(v, null /* targets */);
		RunnableList onEndCallback = new RunnableList();
		mAppLaunchRunner = new AppLaunchAnimationRunner(mHandler, v, onEndCallback);
		RemoteAnimationRunnerCompat runner = new WrappedLauncherAnimationRunner<>(
		mAppLaunchRunner = new AppLaunchAnimationRunner(v, onEndCallback);
		RemoteAnimationRunnerCompat runner = new LauncherAnimationRunner(
		mHandler, mAppLaunchRunner, true /* startAtFrontOfQueue */);

		// Note that this duration is a guess as we do not know if the animation will be a
		@@ -1006,7 +1007,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		definition.addRemoteAnimation(WindowManagerWrapper.TRANSIT_WALLPAPER_OPEN,
		WindowManagerWrapper.ACTIVITY_TYPE_STANDARD,
		new RemoteAnimationAdapterCompat(
		new WrappedLauncherAnimationRunner<>(mHandler, mWallpaperOpenRunner,
		new LauncherAnimationRunner(mHandler, mWallpaperOpenRunner,
		false /* startAtFrontOfQueue */),
		CLOSING_TRANSITION_DURATION_MS, 0 /* statusBarTransitionDelay */));

		@@ -1015,7 +1016,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		definition.addRemoteAnimation(
		WindowManagerWrapper.TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER,
		new RemoteAnimationAdapterCompat(
		new WrappedLauncherAnimationRunner<>(
		new LauncherAnimationRunner(
		mHandler, mKeyguardGoingAwayRunner,
		true /* startAtFrontOfQueue */),
		CLOSING_TRANSITION_DURATION_MS, 0 /* statusBarTransitionDelay */));
		@@ -1035,7 +1036,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		if (hasControlRemoteAppTransitionPermission()) {
		mWallpaperOpenTransitionRunner = createWallpaperOpenRunner(false /* fromUnlock */);
		mLauncherOpenTransition = RemoteAnimationAdapterCompat.buildRemoteTransition(
		new WrappedLauncherAnimationRunner<>(mHandler, mWallpaperOpenTransitionRunner,
		new LauncherAnimationRunner(mHandler, mWallpaperOpenTransitionRunner,
		false /* startAtFrontOfQueue */));
		mLauncherOpenTransition.addHomeOpenCheck();
		SystemUiProxy.INSTANCE.getNoCreate().registerRemoteTransition(mLauncherOpenTransition);
		@@ -1093,7 +1094,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		* @return Runner that plays when user goes to Launcher
		* ie. pressing home, swiping up from nav bar.
		*/
		WrappedAnimationRunnerImpl createWallpaperOpenRunner(boolean fromUnlock) {
		RemoteAnimationFactory createWallpaperOpenRunner(boolean fromUnlock) {
		return new WallpaperOpenLauncherAnimationRunner(mHandler, fromUnlock);
		}

		@@ -1243,7 +1244,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		/**
		* Remote animation runner for animation from the app to Launcher, including recents.
		*/
		protected class WallpaperOpenLauncherAnimationRunner implements WrappedAnimationRunnerImpl {
		protected class WallpaperOpenLauncherAnimationRunner implements RemoteAnimationFactory {

		private final Handler mHandler;
		private final boolean mFromUnlock;
		@@ -1331,17 +1332,12 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		/**
		* Remote animation runner for animation to launch an app.
		*/
		private class AppLaunchAnimationRunner implements WrappedAnimationRunnerImpl {
		private class AppLaunchAnimationRunner implements RemoteAnimationFactory {

		private static final String TRANSITION_LAUNCH_FROM_RECENTS = "transition:LaunchFromRecents";
		private static final String TRANSITION_LAUNCH_FROM_ICON = "transition:LaunchFromIcon";

		private final Handler mHandler;
		private final View mV;
		private final RunnableList mOnEndCallback;

		AppLaunchAnimationRunner(Handler handler, View v, RunnableList onEndCallback) {
		mHandler = handler;
		AppLaunchAnimationRunner(View v, RunnableList onEndCallback) {
		mV = v;
		mOnEndCallback = onEndCallback;
		}
		@@ -1385,6 +1381,11 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		result.setAnimation(anim, mLauncher, mOnEndCallback::executeAllAndDestroy,
		skipFirstFrame);
		}

		@Override
		public void onAnimationCancelled() {
		mOnEndCallback.executeAllAndDestroy();
		}
		}

		/**

quickstep/src/com/android/launcher3/WrappedAnimationRunnerImpl.java

deleted100644 → 0

+0 −32

Original line number	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.launcher3;

		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

		/**
		* Used with WrappedLauncherAnimationRunner as an interface for the runner to call back to the
		* implementation.
		*/
		public interface WrappedAnimationRunnerImpl {

		void onCreateAnimation(int transit,
		RemoteAnimationTargetCompat[] appTargets,
		RemoteAnimationTargetCompat[] wallpaperTargets,
		RemoteAnimationTargetCompat[] nonAppTargets,
		LauncherAnimationRunner.AnimationResult result);
		}

quickstep/src/com/android/launcher3/WrappedLauncherAnimationRunner.java

deleted100644 → 0

+0 −65

Original line number	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.launcher3;

		import android.os.Handler;

		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

		import java.lang.ref.WeakReference;

		/**
		* This class is needed to wrap any animation runner that is a part of the
		* RemoteAnimationDefinition:
		* - Launcher creates a new instance of the LauncherAppTransitionManagerImpl whenever it is
		* created, which in turn registers a new definition
		* - When the definition is registered, window manager retains a strong binder reference to the
		* runner passed in
		* - If the Launcher activity is recreated, the new definition registered will replace the old
		* reference in the system's activity record, but until the system server is GC'd, the binder
		* reference will still exist, which references the runner in the Launcher process, which
		* references the (old) Launcher activity through this class
		*
		* Instead we make the runner provided to the definition static only holding a weak reference to
		* the runner implementation. When this animation manager is destroyed, we remove the Launcher
		* reference to the runner, leaving only the weak ref from the runner.
		*/
		public class WrappedLauncherAnimationRunner<R extends WrappedAnimationRunnerImpl>
		extends LauncherAnimationRunner {
		private WeakReference<R> mImpl;

		public WrappedLauncherAnimationRunner(
		Handler handler, R animationRunnerImpl, boolean startAtFrontOfQueue) {
		super(handler, startAtFrontOfQueue);
		mImpl = new WeakReference<>(animationRunnerImpl);
		}

		@Override
		public void onCreateAnimation(int transit,
		RemoteAnimationTargetCompat[] appTargets,
		RemoteAnimationTargetCompat[] wallpaperTargets,
		RemoteAnimationTargetCompat[] nonAppTargets,
		AnimationResult result) {
		R animationRunnerImpl = mImpl.get();
		if (animationRunnerImpl != null) {
		animationRunnerImpl.onCreateAnimation(transit, appTargets, wallpaperTargets,
		nonAppTargets, result);
		} else {
		result.setAnimation(null, null);
		}
		}
		}