Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e86bd0e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 79ff586c 58dd901b

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

+4 −2
Original line number Diff line number Diff line
@@ -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);

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

+2 −2
Original line number Diff line number Diff line
@@ -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();