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

Commit b76356a2 authored by Alex Chau's avatar Alex Chau
Browse files

Remove unused PreviewPositionHelper.setSplitBounds 

Bug: 336612373
Test: manual
Flag: EXEMPT refactor
Change-Id: I916341973c4279e548af59452842bc0a677ef6b0
parent 33e35cab

quickstep/src/com/android/quickstep/util/SplitScreenUtils.kt

+4 −20
Original line number Diff line number Diff line
@@ -31,29 +31,13 @@ class SplitScreenUtils { 
                null

            } else {

                SplitConfigurationOptions.SplitBounds(

                    shellSplitBounds.leftTopBounds, shellSplitBounds.rightBottomBounds,

                    shellSplitBounds.leftTopTaskId, shellSplitBounds.rightBottomTaskId,

                    shellSplitBounds.leftTopBounds,

                    shellSplitBounds.rightBottomBounds,

                    shellSplitBounds.leftTopTaskId,

                    shellSplitBounds.rightBottomTaskId,

                    shellSplitBounds.snapPosition

                )

            }

        }



        /** Converts the launcher version of SplitBounds to the shell version */

        @JvmStatic

        fun convertLauncherSplitBoundsToShell(

            launcherSplitBounds: SplitConfigurationOptions.SplitBounds?

        ): SplitBounds? {

            return if (launcherSplitBounds == null) {

                null

            } else {

                SplitBounds(

                    launcherSplitBounds.leftTopBounds,

                    launcherSplitBounds.rightBottomBounds,

                    launcherSplitBounds.leftTopTaskId,

                    launcherSplitBounds.rightBottomTaskId,

                    launcherSplitBounds.snapPosition

                )

            }

        }

    }

}

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

+0 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import static com.android.launcher3.util.SplitConfigurationOptions.StagePosition 
import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;

import static com.android.quickstep.util.RecentsOrientedState.postDisplayRotation;

import static com.android.quickstep.util.RecentsOrientedState.preDisplayRotation;

import static com.android.quickstep.util.SplitScreenUtils.convertLauncherSplitBoundsToShell;



import android.animation.TimeInterpolator;

import android.content.Context;
@@ -247,8 +246,6 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { 
        } else {

            mStagePosition = runningTarget.taskId == splitInfo.leftTopTaskId

                    ? STAGE_POSITION_TOP_OR_LEFT : STAGE_POSITION_BOTTOM_OR_RIGHT;

            mPositionHelper.setSplitBounds(convertLauncherSplitBoundsToShell(mSplitBounds),

                    mStagePosition);

        }

        calculateTaskSize();

    }

quickstep/src/com/android/quickstep/views/GroupedTaskView.kt

+1 −19
Original line number Diff line number Diff line
@@ -33,10 +33,8 @@ import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_O 
import com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_UNDEFINED

import com.android.quickstep.TaskOverlayFactory

import com.android.quickstep.util.RecentsOrientedState

import com.android.quickstep.util.SplitScreenUtils.Companion.convertLauncherSplitBoundsToShell

import com.android.quickstep.util.SplitSelectStateController

import com.android.systemui.shared.recents.model.Task

import com.android.systemui.shared.recents.utilities.PreviewPositionHelper

import com.android.systemui.shared.system.InteractionJankMonitorWrapper

import com.android.wm.shell.common.split.SplitScreenConstants.PersistentSnapPosition
@@ -147,23 +145,7 @@ class GroupedTaskView @JvmOverloads constructor(context: Context, attrs: Attribu 
            )

        taskContainers.forEach { it.bind() }



        this.splitBoundsConfig =

            splitBoundsConfig?.also {

                taskContainers[0]

                    .thumbnailViewDeprecated

                    .previewPositionHelper

                    .setSplitBounds(

                        convertLauncherSplitBoundsToShell(it),

                        PreviewPositionHelper.STAGE_POSITION_TOP_OR_LEFT

                    )

                taskContainers[1]

                    .thumbnailViewDeprecated

                    .previewPositionHelper

                    .setSplitBounds(

                        convertLauncherSplitBoundsToShell(it),

                        PreviewPositionHelper.STAGE_POSITION_BOTTOM_OR_RIGHT

                    )

            }

        this.splitBoundsConfig = splitBoundsConfig

        taskContainers.forEach { it.digitalWellBeingToast?.setSplitBounds(splitBoundsConfig) }

        setOrientationState(orientedState)

    }