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
This commit is contained in:
TreeHugger Robot
2021-09-04 04:46:41 +00:00
committed by Automerger Merge Worker
2 changed files with 6 additions and 4 deletions
@@ -289,9 +289,11 @@ public abstract class SwipeUpAnimationLogic implements
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);
@@ -51,8 +51,8 @@ import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat.
*/
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();