commit 58dd901bc17c8cb24309df4863f5c12fbcb71632
author Vinit Nayak <peanutbutter@google.com> Fri Sep 03 16:31:29 2021 -0700
committer Vinit Nayak <peanutbutter@google.com> Sat Sep 04 04:31:56 2021 +0000
tree 1a57db96e9aff4d8c1dd1dcf625abc803e998538
parent b9e08f5773714ce3f6d87a85509bf6c44b3a24de

Select remote apps based on stagePosition instead of hardcoded values

* LauncherSplitScreenListener returns taskIds guaranteeing index 0
to be leftTop task and index 1 to be rightBottom. Use that
instead of assuming remote target index 0 will be leftTop and
index 1 is right bottom as provided

Bug: 181704764

Change-Id: I2bc358ff3c2f2d127b81e10824e2c13f3ad718df

quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java

diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
index e14dbb1..78de300 100644
--- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
+++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java
@@ -289,9 +289,11 @@
                 mRemoteTargetHandles[0].mTaskViewSimulator.setPreview(primaryTaskTarget);
             }
         } else {
+            int[] taskIds = LauncherSplitScreenListener.INSTANCE.getNoCreate()
+                    .getRunningSplitTaskIds();
             // We're in staged split
-            primaryTaskTarget = targets.apps[0];
-            secondaryTaskTarget = targets.apps[1];
+            primaryTaskTarget = targets.findTask(taskIds[0]);
+            secondaryTaskTarget = targets.findTask(taskIds[1]);
             mStagedSplitBounds = new SplitConfigurationOptions.StagedSplitBounds(
                     primaryTaskTarget.screenSpaceBounds,
                     secondaryTaskTarget.screenSpaceBounds, dividerTarget.screenSpaceBounds);

quickstep/src/com/android/quickstep/util/TaskViewSimulator.java

diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
index 9960fd3..a089e73 100644
--- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -51,8 +51,8 @@
  */
 public class TaskViewSimulator implements TransformParams.BuilderProxy {
 
-    private final String TAG = "TaskViewSimulator";
-    private final boolean DEBUG = false;
+    private static final String TAG = "TaskViewSimulator";
+    private static final boolean DEBUG = false;
 
     private final Rect mTmpCropRect = new Rect();
     private final RectF mTempRectF = new RectF();