Merge "Fixing LauncherAnimationRunning referring a destroyed activity" into ub-launcher3-master (7ea4409c) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/AppToOverviewAnimationProvider.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ import com.android.systemui.shared.system.TransactionCompat;
		*
		* @param <T> activity that contains the overview
		*/
		final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> implements
		final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> extends
		RemoteAnimationProvider {

		private static final long RECENTS_LAUNCH_DURATION = 250;

+10 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import com.android.launcher3.appprediction.PredictionUiStateManager;
		import com.android.launcher3.logging.UserEventDispatcher;
		import com.android.launcher3.userevent.nano.LauncherLogProto;
		import com.android.quickstep.util.ActivityInitListener;
		import com.android.quickstep.util.RemoteAnimationProvider;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		@@ -187,7 +188,15 @@ public class OverviewCommandHelper {
		// Otherwise, start overview.
		mListener = mActivityInterface.createActivityInitListener(this::onActivityReady);
		mListener.registerAndStartActivity(mOverviewComponentObserver.getOverviewIntent(),
		this::createWindowAnimation, mContext, MAIN_EXECUTOR.getHandler(),
		new RemoteAnimationProvider() {
		@Override
		public AnimatorSet createWindowAnimation(
		RemoteAnimationTargetCompat[] appTargets,
		RemoteAnimationTargetCompat[] wallpaperTargets) {
		return RecentsActivityCommand.this.createWindowAnimation(appTargets,
		wallpaperTargets);
		}
		}, mContext, MAIN_EXECUTOR.getHandler(),
		mAnimationProvider.getRecentsLaunchDuration());
		}

+17 −11

Original line number	Diff line number	Diff line
		@@ -52,10 +52,12 @@ import com.android.quickstep.SysUINavigationMode;
		import com.android.quickstep.SysUINavigationMode.Mode;
		import com.android.quickstep.SysUINavigationMode.NavigationModeChangeListener;
		import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.util.RemoteAnimationProvider;
		import com.android.quickstep.util.RemoteFadeOutAnimationListener;
		import com.android.quickstep.util.ShelfPeekAnim;
		import com.android.quickstep.views.RecentsView;
		import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

		import java.util.stream.Stream;

		@@ -262,7 +264,10 @@ public abstract class BaseQuickstepLauncher extends Launcher
		public void useFadeOutAnimationForLauncherStart(CancellationSignal signal) {
		QuickstepAppTransitionManagerImpl appTransitionManager =
		(QuickstepAppTransitionManagerImpl) getAppTransitionManager();
		appTransitionManager.setRemoteAnimationProvider((appTargets, wallpaperTargets) -> {
		appTransitionManager.setRemoteAnimationProvider(new RemoteAnimationProvider() {
		@Override
		public AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] appTargets,
		RemoteAnimationTargetCompat[] wallpaperTargets) {

		// On the first call clear the reference.
		signal.cancel();
		@@ -273,6 +278,7 @@ public abstract class BaseQuickstepLauncher extends Launcher
		AnimatorSet anim = new AnimatorSet();
		anim.play(fadeAnimation);
		return anim;
		}
		}, signal);
		}

+6 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,8 @@ import com.android.systemui.shared.system.RemoteAnimationRunnerCompat;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

		@TargetApi(Build.VERSION_CODES.P)
		public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat {
		public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat,
		WrappedAnimationRunnerImpl {

		private final Handler mHandler;
		private final boolean mStartAtFrontOfQueue;
		@@ -49,6 +50,10 @@ public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCo
		mStartAtFrontOfQueue = startAtFrontOfQueue;
		}

		public Handler getHandler() {
		return mHandler;
		}

		// Called only in R+ platform
		@BinderThread
		public void onAnimationStart(RemoteAnimationTargetCompat[] appTargets,

+14 −8

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		*/
		package com.android.launcher3;

		import android.animation.AnimatorSet;
		import android.annotation.TargetApi;
		import android.content.Context;
		import android.content.Intent;
		@@ -25,6 +26,7 @@ import android.os.Handler;
		import com.android.launcher3.util.ActivityTracker;
		import com.android.quickstep.util.ActivityInitListener;
		import com.android.quickstep.util.RemoteAnimationProvider;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;

		import java.util.function.BiPredicate;

		@@ -51,7 +53,10 @@ public class LauncherInitListener extends ActivityInitListener<Launcher> {
		// Set a one-time animation provider. After the first call, this will get cleared.
		// TODO: Probably also check the intended target id.
		CancellationSignal cancellationSignal = new CancellationSignal();
		appTransitionManager.setRemoteAnimationProvider((appTargets, wallpaperTargets) -> {
		appTransitionManager.setRemoteAnimationProvider(new RemoteAnimationProvider() {
		@Override
		public AnimatorSet createWindowAnimation(RemoteAnimationTargetCompat[] appTargets,
		RemoteAnimationTargetCompat[] wallpaperTargets) {

		// On the first call clear the reference.
		cancellationSignal.cancel();
		@@ -62,6 +67,7 @@ public class LauncherInitListener extends ActivityInitListener<Launcher> {
		return provider.createWindowAnimation(appTargets, wallpaperTargets);
		}
		return null;
		}
		}, cancellationSignal);
		}
		launcher.deferOverlayCallbacksUntilNextResumeOrStop();