commit a0de13e939819d4f501011b259e1278f366fd23d
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Sep 04 04:46:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Sep 04 04:46:41 2021 +0000
tree 52f9c5bbc3a4b24156d8e8eff2e0da40aab8258e
parent 6e78f77f015cea2ad38ba2f72977125d7d941e1c
parent 1e86bd0ec63780f2b2ff9faccac22ef0040d7f4f

Merge "Select remote apps based on stagePosition instead of hardcoded values" into sc-v2-dev am: 1e86bd0ec6

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

Change-Id: I7d50882c8edf75add6c85db51031b4c8144e55a7

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();