Snap for 6683823 from d481c5c58c489fb8339ddc4e9a872230e6d563b2 to rvc-release (621ef1e2) · Commits · e / os / android_packages_apps_Trebuchet

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;
		import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.HIDE;
		import static com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState.PEEK;
		import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;
		import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;

		import android.animation.Animator;
		import android.animation.TimeInterpolator;
		@@ -90,6 +91,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper;
		import com.android.systemui.shared.system.InputConsumerController;
		import com.android.systemui.shared.system.LatencyTrackerCompat;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
		import com.android.systemui.shared.system.TaskInfoCompat;
		import com.android.systemui.shared.system.TaskStackChangeListener;

		/**
		@@ -940,7 +942,8 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte
		@Override
		public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
		boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
		if (task.taskId == mGestureState.getRunningTaskId()) {
		if (task.taskId == mGestureState.getRunningTaskId()
		&& TaskInfoCompat.getActivityType(task) != ACTIVITY_TYPE_HOME) {
		// Since this is an edge case, just cancel and relaunch with default activity
		// options (since we don't know if there's an associated app icon to launch from)
		endRunningWindowAnim(true /* cancel */);
		@@ -1327,6 +1330,6 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte

		private static boolean isNotInRecents(RemoteAnimationTargetCompat app) {
		return app.isNotInRecents
		\|\| app.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME;
		\|\| app.activityType == ACTIVITY_TYPE_HOME;
		}
		}