Merge "End recents animation when entering split select" into sc-v2-dev am: 6c71f688b2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15321610

Change-Id: I77de6e1f72594fa8764c68c042e3989ed3fc44ee

quickstep/src/com/android/quickstep/SystemUiProxy.java

@@ -358,7 +358,7 @@ public class SystemUiProxy implements ISystemUiProxy,
             try {
                 mSystemUiProxy.setSplitScreenMinimized(minimized);
             } catch (RemoteException e) {
-                Log.w(TAG, "Failed call stopScreenPinning", e);
+                Log.w(TAG, "Failed call setSplitScreenMinimized", e);
             }
         }
     }

quickstep/src/com/android/quickstep/views/RecentsView.java

@@ -3090,6 +3090,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
                 splitController.getLayoutParamsForActivePosition(getResources(),
                         mActivity.getDeviceProfile()));
         mSplitPlaceholderView.setIcon(taskView.getIconView());
+        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+            finishRecentsAnimation(true, null);
+        }
     }
 
     public PendingAnimation createSplitSelectInitAnimation() {

quickstep/src/com/android/quickstep/views/TaskView.java

@@ -531,6 +531,9 @@ public class TaskView extends FrameLayout implements Reusable {
         if (getTask() == null) {
             return;
         }
+        if (confirmSecondSplitSelectApp()) {
+            return;
+        }
         if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {
             if (!mIsClickableAsLiveTile) {
                 return;
@@ -549,7 +552,7 @@ public class TaskView extends FrameLayout implements Reusable {
             if (targets == null) {
                 // If the recents animation is cancelled somehow between the parent if block and
                 // here, try to launch the task as a non live tile task.
-                launcherNonLiveTileTask();
+                launchTaskAnimated();
                 return;
             }
 
@@ -567,19 +570,22 @@ public class TaskView extends FrameLayout implements Reusable {
             });
             anim.start();
         } else {
-            launcherNonLiveTileTask();
+            launchTaskAnimated();
         }
         mActivity.getStatsLogManager().logger().withItemInfo(getItemInfo())
                 .log(LAUNCHER_TASK_LAUNCH_TAP);
     }
 
-    private void launcherNonLiveTileTask() {
+    /**
-        if (mActivity.isInState(OVERVIEW_SPLIT_SELECT)) {
+     * @return {@code true} if user is already in split select mode and this tap was to choose the
-            // User tapped to select second split screen app
+     *         second app. {@code false} otherwise
+     */
+    private boolean confirmSecondSplitSelectApp() {
+        boolean isSelectingSecondSplitApp = mActivity.isInState(OVERVIEW_SPLIT_SELECT);
+        if (isSelectingSecondSplitApp) {
             getRecentsView().confirmSplitSelect(this);
-        } else {
-            launchTaskAnimated();
         }
+        return isSelectingSecondSplitApp;
     }
 
     /**