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

Commit 5424fca6 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Rename split classes/variables for consistency 

* Use "select" when in the split screen
invocation process
* Drop usage of "staged" except when defining
constants

Fixes: 233006032
Change-Id: I809f0e1e9742aa6b6b09ad8731896ad3f0c9deb0
parent 863ebce7

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+3 −3
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 


    protected void notifyGestureAnimationStartToRecents() {

        Task[] runningTasks;

        if (mIsSwipeForStagedSplit) {

        if (mIsSwipeForSplit) {

            int[] splitTaskIds = TopTaskTracker.INSTANCE.get(mContext).getRunningSplitTaskIds();

            runningTasks = mGestureState.getRunningTask().getPlaceholderTasks(splitTaskIds);

        } else {
@@ -1292,7 +1292,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
            HomeAnimationFactory homeAnimFactory =

                    createHomeAnimationFactory(cookies, duration, isTranslucent, appCanEnterPip,

                            runningTaskTarget);

            mIsSwipingPipToHome = !mIsSwipeForStagedSplit && appCanEnterPip;

            mIsSwipingPipToHome = !mIsSwipeForSplit && appCanEnterPip;

            final RectFSpringAnim[] windowAnim;

            if (mIsSwipingPipToHome) {

                mSwipePipToHomeAnimator = createWindowAnimationToPip(
@@ -1793,7 +1793,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
                    mSwipePipToHomeAnimator.getFinishTransaction(),

                    mSwipePipToHomeAnimator.getContentOverlay());

            mIsSwipingPipToHome = false;

        } else if (mIsSwipeForStagedSplit) {

        } else if (mIsSwipeForSplit) {

            // Transaction to hide the task to avoid flicker for entering PiP from split-screen.

            PictureInPictureSurfaceTransaction tx =

                    new PictureInPictureSurfaceTransaction.Builder()

quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class LauncherSwipeHandlerV2 extends 
            mActivity.setHintUserWillBeActive();

        }



        if (!canUseWorkspaceView || appCanEnterPip || mIsSwipeForStagedSplit) {

        if (!canUseWorkspaceView || appCanEnterPip || mIsSwipeForSplit) {

            return new LauncherHomeAnimationFactory();

        }

        if (workspaceView instanceof LauncherAppWidgetHostView) {

quickstep/src/com/android/quickstep/RecentTasksList.java

+6 −6
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ import com.android.systemui.shared.recents.model.Task; 
import com.android.systemui.shared.system.KeyguardManagerCompat;

import com.android.wm.shell.recents.IRecentTasksListener;

import com.android.wm.shell.util.GroupedRecentTaskInfo;

import com.android.wm.shell.util.StagedSplitBounds;

import com.android.wm.shell.util.SplitBounds;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -195,19 +195,19 @@ public class RecentTasksList { 
                                tmpLockedUsers.get(task2Key.userId) /* isLocked */);

                task2.setLastSnapshotData(taskInfo2);

            }

            final SplitConfigurationOptions.StagedSplitBounds launcherSplitBounds =

                    convertSplitBounds(rawTask.mStagedSplitBounds);

            final SplitConfigurationOptions.SplitBounds launcherSplitBounds =

                    convertSplitBounds(rawTask.mSplitBounds);

            allTasks.add(new GroupTask(task1, task2, launcherSplitBounds));

        }



        return allTasks;

    }



    private SplitConfigurationOptions.StagedSplitBounds convertSplitBounds(

            StagedSplitBounds shellSplitBounds) {

    private SplitConfigurationOptions.SplitBounds convertSplitBounds(

            SplitBounds shellSplitBounds) {

        return shellSplitBounds == null ?

                null :

                new SplitConfigurationOptions.StagedSplitBounds(

                new SplitConfigurationOptions.SplitBounds(

                        shellSplitBounds.leftTopBounds, shellSplitBounds.rightBottomBounds,

                        shellSplitBounds.leftTopTaskId, shellSplitBounds.rightBottomTaskId);

    }

quickstep/src/com/android/quickstep/RemoteTargetGluer.java

+7 −7
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.content.Context; 


import androidx.annotation.Nullable;



import com.android.launcher3.util.SplitConfigurationOptions.StagedSplitBounds;

import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds;

import com.android.quickstep.util.AnimatorControllerWithResistance;

import com.android.quickstep.util.TaskViewSimulator;

import com.android.quickstep.util.TransformParams;
@@ -34,7 +34,7 @@ import java.util.ArrayList; 
 */

public class RemoteTargetGluer {

    private RemoteTargetHandle[] mRemoteTargetHandles;

    private StagedSplitBounds mStagedSplitBounds;

    private SplitBounds mSplitBounds;



    /**

     * Use this constructor if remote targets are split-screen independent
@@ -118,18 +118,18 @@ public class RemoteTargetGluer { 


            // remoteTargetHandle[0] denotes topLeft task, so we pass in the bottomRight to exclude,

            // vice versa

            mStagedSplitBounds = new StagedSplitBounds(

            mSplitBounds = new SplitBounds(

                    topLeftTarget.startScreenSpaceBounds,

                    bottomRightTarget.startScreenSpaceBounds, splitIds[0], splitIds[1]);

            mRemoteTargetHandles[0].mTransformParams.setTargetSet(

                    createRemoteAnimationTargetsForTarget(targets, bottomRightTarget));

            mRemoteTargetHandles[0].mTaskViewSimulator.setPreview(topLeftTarget,

                    mStagedSplitBounds);

                    mSplitBounds);



            mRemoteTargetHandles[1].mTransformParams.setTargetSet(

                    createRemoteAnimationTargetsForTarget(targets, topLeftTarget));

            mRemoteTargetHandles[1].mTaskViewSimulator.setPreview(bottomRightTarget,

                    mStagedSplitBounds);

                    mSplitBounds);

        }

        return mRemoteTargetHandles;

    }
@@ -173,8 +173,8 @@ public class RemoteTargetGluer { 
        return mRemoteTargetHandles;

    }



    public StagedSplitBounds getStagedSplitBounds() {

        return mStagedSplitBounds;

    public SplitBounds getSplitBounds() {

        return mSplitBounds;

    }



    /**

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

+2 −4
Original line number Diff line number Diff line
@@ -71,16 +71,14 @@ public abstract class SwipeUpAnimationLogic implements 
    // How much further we can drag past recents, as a factor of mTransitionDragLength.

    protected float mDragLengthFactor = 1;



    protected boolean mIsSwipeForStagedSplit;

    protected boolean mIsSwipeForSplit;



    public SwipeUpAnimationLogic(Context context, RecentsAnimationDeviceState deviceState,

            GestureState gestureState) {

        mContext = context;

        mDeviceState = deviceState;

        mGestureState = gestureState;



        mIsSwipeForStagedSplit =

                TopTaskTracker.INSTANCE.get(context).getRunningSplitTaskIds().length > 1;

        mIsSwipeForSplit = TopTaskTracker.INSTANCE.get(context).getRunningSplitTaskIds().length > 1;



        mTargetGluer = new RemoteTargetGluer(mContext, mGestureState.getActivityInterface());

        mRemoteTargetHandles = mTargetGluer.getRemoteTargetHandles();