From 5424fca602e3cde8c605f5f267ff6561b92523a7 Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Fri, 27 May 2022 15:59:40 -0700 Subject: [PATCH] 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 --- .../android/quickstep/AbsSwipeUpHandler.java | 6 +++--- .../quickstep/LauncherSwipeHandlerV2.java | 2 +- .../com/android/quickstep/RecentTasksList.java | 12 ++++++------ .../android/quickstep/RemoteTargetGluer.java | 14 +++++++------- .../quickstep/SwipeUpAnimationLogic.java | 6 ++---- .../com/android/quickstep/TopTaskTracker.java | 11 ++++++----- .../com/android/quickstep/util/GroupTask.java | 11 ++++++----- .../quickstep/util/TaskViewSimulator.java | 14 +++++++------- .../quickstep/views/DigitalWellBeingToast.java | 18 +++++++++--------- .../quickstep/views/FloatingTaskView.java | 2 +- .../quickstep/views/GroupedTaskView.java | 10 +++++----- .../android/quickstep/views/RecentsView.java | 10 +++++----- .../touch/LandscapePagedViewHandler.java | 12 ++++++------ .../touch/PagedOrientationHandler.java | 12 ++++++------ .../touch/PortraitPagedViewHandler.java | 12 ++++++------ .../touch/SeascapePagedViewHandler.java | 6 +++--- .../util/SplitConfigurationOptions.java | 6 +++--- 17 files changed, 82 insertions(+), 82 deletions(-) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index d676f7d195..13272e9cf4 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -575,7 +575,7 @@ public abstract class AbsSwipeUpHandler, 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, 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, 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() diff --git a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java index 50d1244c81..196a6642ba 100644 --- a/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java +++ b/quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java @@ -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) { diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java index 097850fd6f..cd93dbe509 100644 --- a/quickstep/src/com/android/quickstep/RecentTasksList.java +++ b/quickstep/src/com/android/quickstep/RecentTasksList.java @@ -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); } diff --git a/quickstep/src/com/android/quickstep/RemoteTargetGluer.java b/quickstep/src/com/android/quickstep/RemoteTargetGluer.java index c3ea25683d..7183c49ca2 100644 --- a/quickstep/src/com/android/quickstep/RemoteTargetGluer.java +++ b/quickstep/src/com/android/quickstep/RemoteTargetGluer.java @@ -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; } /** diff --git a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java index f2f2def808..baeb514e18 100644 --- a/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java +++ b/quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java @@ -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(); diff --git a/quickstep/src/com/android/quickstep/TopTaskTracker.java b/quickstep/src/com/android/quickstep/TopTaskTracker.java index 723dc721a9..42fa86d970 100644 --- a/quickstep/src/com/android/quickstep/TopTaskTracker.java +++ b/quickstep/src/com/android/quickstep/TopTaskTracker.java @@ -33,7 +33,7 @@ import com.android.launcher3.util.MainThreadInitializedObject; import com.android.launcher3.util.SplitConfigurationOptions; import com.android.launcher3.util.SplitConfigurationOptions.StagePosition; import com.android.launcher3.util.SplitConfigurationOptions.StageType; -import com.android.launcher3.util.SplitConfigurationOptions.StagedSplitTaskPosition; +import com.android.launcher3.util.SplitConfigurationOptions.SplitStageInfo; import com.android.launcher3.util.TraceHelper; import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.recents.model.Task.TaskKey; @@ -63,8 +63,9 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta // Ordered list with first item being the most recent task. private final LinkedList mOrderedTaskList = new LinkedList<>(); - private final StagedSplitTaskPosition mMainStagePosition = new StagedSplitTaskPosition(); - private final StagedSplitTaskPosition mSideStagePosition = new StagedSplitTaskPosition(); + + private final SplitStageInfo mMainStagePosition = new SplitStageInfo(); + private final SplitStageInfo mSideStagePosition = new SplitStageInfo(); private int mPinnedTaskId = INVALID_TASK_ID; private TopTaskTracker(Context context) { @@ -144,8 +145,8 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta mPinnedTaskId = INVALID_TASK_ID; } - private void resetTaskId(StagedSplitTaskPosition taskPosition) { - taskPosition.taskId = INVALID_TASK_ID; + private void resetTaskId(SplitStageInfo taskPosition) { + taskPosition.taskId = -1; } /** diff --git a/quickstep/src/com/android/quickstep/util/GroupTask.java b/quickstep/src/com/android/quickstep/util/GroupTask.java index e2563e398d..f30d00c722 100644 --- a/quickstep/src/com/android/quickstep/util/GroupTask.java +++ b/quickstep/src/com/android/quickstep/util/GroupTask.java @@ -19,7 +19,7 @@ package com.android.quickstep.util; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.android.launcher3.util.SplitConfigurationOptions.StagedSplitBounds; +import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; import com.android.systemui.shared.recents.model.Task; /** @@ -29,13 +29,14 @@ import com.android.systemui.shared.recents.model.Task; public class GroupTask { public @NonNull Task task1; public @Nullable Task task2; - public @Nullable StagedSplitBounds mStagedSplitBounds; + public @Nullable + SplitBounds mSplitBounds; public GroupTask(@NonNull Task t1, @Nullable Task t2, - @Nullable StagedSplitBounds stagedSplitBounds) { + @Nullable SplitBounds splitBounds) { task1 = t1; task2 = t2; - mStagedSplitBounds = stagedSplitBounds; + mSplitBounds = splitBounds; } public GroupTask(@NonNull GroupTask group) { @@ -43,7 +44,7 @@ public class GroupTask { task2 = group.task2 != null ? new Task(group.task2) : null; - mStagedSplitBounds = group.mStagedSplitBounds; + mSplitBounds = group.mSplitBounds; } public boolean containsTask(int taskId) { diff --git a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java index 5212755ec7..dbb20e0cea 100644 --- a/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java +++ b/quickstep/src/com/android/quickstep/util/TaskViewSimulator.java @@ -40,7 +40,7 @@ import androidx.annotation.NonNull; import com.android.launcher3.DeviceProfile; import com.android.launcher3.Utilities; import com.android.launcher3.anim.PendingAnimation; -import com.android.launcher3.util.SplitConfigurationOptions.StagedSplitBounds; +import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; import com.android.launcher3.util.TraceHelper; import com.android.quickstep.AnimatedFloat; import com.android.quickstep.BaseActivityInterface; @@ -100,7 +100,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { // Cached calculations private boolean mLayoutValid = false; private int mOrientationStateId; - private StagedSplitBounds mStagedSplitBounds; + private SplitBounds mSplitBounds; private boolean mDrawsBelowRecents; private boolean mIsGridTask; private int mTaskRectTranslationX; @@ -152,13 +152,13 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { } Rect fullTaskSize; - if (mStagedSplitBounds != null) { + if (mSplitBounds != null) { // The task rect changes according to the staged split task sizes, but recents // fullscreen scale and pivot remains the same since the task fits into the existing // sized task space bounds fullTaskSize = new Rect(mTaskRect); mOrientationState.getOrientationHandler() - .setSplitTaskSwipeRect(mDp, mTaskRect, mStagedSplitBounds, mStagePosition); + .setSplitTaskSwipeRect(mDp, mTaskRect, mSplitBounds, mStagePosition); mTaskRect.offset(mTaskRectTranslationX, mTaskRectTranslationY); } else { fullTaskSize = mTaskRect; @@ -180,10 +180,10 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy { * * @param splitInfo set to {@code null} when not in staged split mode */ - public void setPreview(RemoteAnimationTargetCompat runningTarget, StagedSplitBounds splitInfo) { + public void setPreview(RemoteAnimationTargetCompat runningTarget, SplitBounds splitInfo) { setPreview(runningTarget); - mStagedSplitBounds = splitInfo; - if (mStagedSplitBounds == null) { + mSplitBounds = splitInfo; + if (mSplitBounds == null) { mStagePosition = STAGE_POSITION_UNDEFINED; return; } diff --git a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java index 79b15c713a..76552a3d50 100644 --- a/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java +++ b/quickstep/src/com/android/quickstep/views/DigitalWellBeingToast.java @@ -53,7 +53,7 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.touch.PagedOrientationHandler; -import com.android.launcher3.util.SplitConfigurationOptions.StagedSplitBounds; +import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; import com.android.systemui.shared.recents.model.Task; import java.lang.annotation.Retention; @@ -103,7 +103,7 @@ public final class DigitalWellBeingToast { */ private float mModalOffset = 0f; @Nullable - private StagedSplitBounds mStagedSplitBounds; + private SplitBounds mSplitBounds; private int mSplitBannerConfig = SPLIT_BANNER_FULLSCREEN; private float mSplitOffsetTranslationY; private float mSplitOffsetTranslationX; @@ -164,9 +164,9 @@ public final class DigitalWellBeingToast { }); } - public void setSplitConfiguration(StagedSplitBounds stagedSplitBounds) { - mStagedSplitBounds = stagedSplitBounds; - if (mStagedSplitBounds == null + public void setSplitConfiguration(SplitBounds splitBounds) { + mSplitBounds = splitBounds; + if (mSplitBounds == null || !mActivity.getDeviceProfile().isTablet || mTaskView.isFocusedTask()) { mSplitBannerConfig = SPLIT_BANNER_FULLSCREEN; @@ -180,11 +180,11 @@ public final class DigitalWellBeingToast { } // For landscape grid, for 30% width we only show icon, otherwise show icon and time - if (mTask.key.id == mStagedSplitBounds.leftTopTaskId) { - mSplitBannerConfig = mStagedSplitBounds.leftTaskPercent < THRESHOLD_LEFT_ICON_ONLY ? + if (mTask.key.id == mSplitBounds.leftTopTaskId) { + mSplitBannerConfig = mSplitBounds.leftTaskPercent < THRESHOLD_LEFT_ICON_ONLY ? SPLIT_GRID_BANNER_SMALL : SPLIT_GRID_BANNER_LARGE; } else { - mSplitBannerConfig = mStagedSplitBounds.leftTaskPercent > THRESHOLD_RIGHT_ICON_ONLY ? + mSplitBannerConfig = mSplitBounds.leftTaskPercent > THRESHOLD_RIGHT_ICON_ONLY ? SPLIT_GRID_BANNER_SMALL : SPLIT_GRID_BANNER_LARGE; } } @@ -321,7 +321,7 @@ public final class DigitalWellBeingToast { PagedOrientationHandler orientationHandler = mTaskView.getPagedOrientationHandler(); Pair translations = orientationHandler .getDwbLayoutTranslations(mTaskView.getMeasuredWidth(), - mTaskView.getMeasuredHeight(), mStagedSplitBounds, deviceProfile, + mTaskView.getMeasuredHeight(), mSplitBounds, deviceProfile, mTaskView.getThumbnails(), mTask.key.id, mBanner); mSplitOffsetTranslationX = translations.first; mSplitOffsetTranslationY = translations.second; diff --git a/quickstep/src/com/android/quickstep/views/FloatingTaskView.java b/quickstep/src/com/android/quickstep/views/FloatingTaskView.java index 45fc3afb25..835c9f7e8e 100644 --- a/quickstep/src/com/android/quickstep/views/FloatingTaskView.java +++ b/quickstep/src/com/android/quickstep/views/FloatingTaskView.java @@ -254,7 +254,7 @@ public class FloatingTaskView extends FrameLayout { * offscreen). */ void centerIconView(IconView iconView, float onScreenRectCenterX, float onScreenRectCenterY) { - mOrientationHandler.updateStagedSplitIconParams(iconView, onScreenRectCenterX, + mOrientationHandler.updateSplitIconParams(iconView, onScreenRectCenterX, onScreenRectCenterY, mFullscreenParams.mScaleX, mFullscreenParams.mScaleY, iconView.getDrawableWidth(), iconView.getDrawableHeight(), mActivity.getDeviceProfile(), mStagePosition); diff --git a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java index 244a794562..cb88068d56 100644 --- a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java +++ b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java @@ -17,7 +17,7 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.util.RunnableList; -import com.android.launcher3.util.SplitConfigurationOptions.StagedSplitBounds; +import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; import com.android.launcher3.util.TransformingTouchDelegate; import com.android.quickstep.RecentsModel; import com.android.quickstep.TaskIconCache; @@ -53,7 +53,7 @@ public class GroupedTaskView extends TaskView { private CancellableTask mIconLoadRequest2; private final float[] mIcon2CenterCoords = new float[2]; private TransformingTouchDelegate mIcon2TouchDelegate; - @Nullable private StagedSplitBounds mSplitBoundsConfig; + @Nullable private SplitBounds mSplitBoundsConfig; private final DigitalWellBeingToast mDigitalWellBeingToast2; public GroupedTaskView(Context context) { @@ -78,7 +78,7 @@ public class GroupedTaskView extends TaskView { } public void bind(Task primary, Task secondary, RecentsOrientedState orientedState, - @Nullable StagedSplitBounds splitBoundsConfig) { + @Nullable SplitBounds splitBoundsConfig) { super.bind(primary, orientedState); mSecondaryTask = secondary; mTaskIdContainer[1] = secondary.key.id; @@ -126,8 +126,8 @@ public class GroupedTaskView extends TaskView { } } - public void updateSplitBoundsConfig(StagedSplitBounds stagedSplitBounds) { - mSplitBoundsConfig = stagedSplitBounds; + public void updateSplitBoundsConfig(SplitBounds splitBounds) { + mSplitBoundsConfig = splitBounds; invalidate(); } diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 0a46121f4e..8f6fba7f4b 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -142,7 +142,7 @@ import com.android.launcher3.util.MultiValueAlpha; import com.android.launcher3.util.ResourceBasedOverride.Overrides; import com.android.launcher3.util.RunnableList; import com.android.launcher3.util.SplitConfigurationOptions.StagePosition; -import com.android.launcher3.util.SplitConfigurationOptions.StagedSplitBounds; +import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; import com.android.launcher3.util.Themes; import com.android.launcher3.util.TranslateEdgeEffect; import com.android.launcher3.util.ViewPool; @@ -625,7 +625,7 @@ public abstract class RecentsView getDwbLayoutTranslations(int taskViewWidth, - int taskViewHeight, StagedSplitBounds splitBounds, DeviceProfile deviceProfile, + int taskViewHeight, SplitBounds splitBounds, DeviceProfile deviceProfile, View[] thumbnailViews, int desiredTaskId, View banner) { boolean isRtl = banner.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL; float translationX = 0; @@ -425,7 +425,7 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { } @Override - public void updateStagedSplitIconParams(View out, float onScreenRectCenterX, + public void updateSplitIconParams(View out, float onScreenRectCenterX, float onScreenRectCenterY, float fullscreenScaleX, float fullscreenScaleY, int drawableWidth, int drawableHeight, DeviceProfile dp, @StagePosition int stagePosition) { @@ -470,7 +470,7 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { @Override public void setSplitTaskSwipeRect(DeviceProfile dp, Rect outRect, - StagedSplitBounds splitInfo, int desiredStagePosition) { + SplitBounds splitInfo, int desiredStagePosition) { float topLeftTaskPercent = splitInfo.appsStackedVertically ? splitInfo.topTaskPercent : splitInfo.leftTaskPercent; @@ -487,7 +487,7 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { @Override public void measureGroupedTaskViewThumbnailBounds(View primarySnapshot, View secondarySnapshot, - int parentWidth, int parentHeight, StagedSplitBounds splitBoundsConfig, + int parentWidth, int parentHeight, SplitBounds splitBoundsConfig, DeviceProfile dp, boolean isRtl) { int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx; int totalThumbnailHeight = parentHeight - spaceAboveSnapshot; @@ -529,7 +529,7 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler { public void setSplitIconParams(View primaryIconView, View secondaryIconView, int taskIconHeight, int primarySnapshotWidth, int primarySnapshotHeight, int groupedTaskViewHeight, int groupedTaskViewWidth, boolean isRtl, - DeviceProfile deviceProfile, StagedSplitBounds splitConfig) { + DeviceProfile deviceProfile, SplitBounds splitConfig) { FrameLayout.LayoutParams primaryIconParams = (FrameLayout.LayoutParams) primaryIconView.getLayoutParams(); FrameLayout.LayoutParams secondaryIconParams = diff --git a/src/com/android/launcher3/touch/PagedOrientationHandler.java b/src/com/android/launcher3/touch/PagedOrientationHandler.java index 2d9d95c1a4..6bc021b515 100644 --- a/src/com/android/launcher3/touch/PagedOrientationHandler.java +++ b/src/com/android/launcher3/touch/PagedOrientationHandler.java @@ -36,7 +36,7 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.util.SplitConfigurationOptions; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; import com.android.launcher3.util.SplitConfigurationOptions.StagePosition; -import com.android.launcher3.util.SplitConfigurationOptions.StagedSplitBounds; +import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; import java.util.List; @@ -129,7 +129,7 @@ public interface PagedOrientationHandler { * @param dp The device profile, used to report rotation and hardware insets. * @param stagePosition 0 if the staging area is pinned to top/left, 1 for bottom/right. */ - void updateStagedSplitIconParams(View out, float onScreenRectCenterX, + void updateSplitIconParams(View out, float onScreenRectCenterX, float onScreenRectCenterY, float fullscreenScaleX, float fullscreenScaleY, int drawableWidth, int drawableHeight, DeviceProfile dp, @StagePosition int stagePosition); @@ -163,12 +163,12 @@ public interface PagedOrientationHandler { * @param desiredStagePosition Which stage position (topLeft/rightBottom) we want to resize * outRect for */ - void setSplitTaskSwipeRect(DeviceProfile dp, Rect outRect, StagedSplitBounds splitInfo, + void setSplitTaskSwipeRect(DeviceProfile dp, Rect outRect, SplitBounds splitInfo, @SplitConfigurationOptions.StagePosition int desiredStagePosition); void measureGroupedTaskViewThumbnailBounds(View primarySnapshot, View secondarySnapshot, int parentWidth, int parentHeight, - StagedSplitBounds splitBoundsConfig, DeviceProfile dp, boolean isRtl); + SplitBounds splitBoundsConfig, DeviceProfile dp, boolean isRtl); // Overview TaskMenuView methods void setTaskIconParams(FrameLayout.LayoutParams iconParams, @@ -176,7 +176,7 @@ public interface PagedOrientationHandler { void setSplitIconParams(View primaryIconView, View secondaryIconView, int taskIconHeight, int primarySnapshotWidth, int primarySnapshotHeight, int groupedTaskViewHeight, int groupedTaskViewWidth, boolean isRtl, - DeviceProfile deviceProfile, StagedSplitBounds splitConfig); + DeviceProfile deviceProfile, SplitBounds splitConfig); /* * The following two methods try to center the TaskMenuView in landscape by finding the center @@ -217,7 +217,7 @@ public interface PagedOrientationHandler { * @return A Pair of Floats representing the proper x and y translations. */ Pair getDwbLayoutTranslations(int taskViewWidth, - int taskViewHeight, StagedSplitBounds splitBounds, DeviceProfile deviceProfile, + int taskViewHeight, SplitBounds splitBounds, DeviceProfile deviceProfile, View[] thumbnailViews, int desiredTaskId, View banner); // The following are only used by TaskViewTouchHandler. diff --git a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java index 942c191be9..181dca56ee 100644 --- a/src/com/android/launcher3/touch/PortraitPagedViewHandler.java +++ b/src/com/android/launcher3/touch/PortraitPagedViewHandler.java @@ -54,7 +54,7 @@ import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.SplitConfigurationOptions; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; import com.android.launcher3.util.SplitConfigurationOptions.StagePosition; -import com.android.launcher3.util.SplitConfigurationOptions.StagedSplitBounds; +import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; import com.android.launcher3.views.BaseDragLayer; import java.util.List; @@ -317,7 +317,7 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { @Override public Pair getDwbLayoutTranslations(int taskViewWidth, - int taskViewHeight, StagedSplitBounds splitBounds, DeviceProfile deviceProfile, + int taskViewHeight, SplitBounds splitBounds, DeviceProfile deviceProfile, View[] thumbnailViews, int desiredTaskId, View banner) { float translationX = 0; float translationY = 0; @@ -470,7 +470,7 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { } @Override - public void updateStagedSplitIconParams(View out, float onScreenRectCenterX, + public void updateSplitIconParams(View out, float onScreenRectCenterX, float onScreenRectCenterY, float fullscreenScaleX, float fullscreenScaleY, int drawableWidth, int drawableHeight, DeviceProfile dp, @StagePosition int stagePosition) { @@ -580,7 +580,7 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { @Override public void setSplitTaskSwipeRect(DeviceProfile dp, Rect outRect, - StagedSplitBounds splitInfo, int desiredStagePosition) { + SplitBounds splitInfo, int desiredStagePosition) { boolean isLandscape = dp.isLandscape; float topLeftTaskPercent = splitInfo.appsStackedVertically ? splitInfo.topTaskPercent @@ -606,7 +606,7 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { @Override public void measureGroupedTaskViewThumbnailBounds(View primarySnapshot, View secondarySnapshot, - int parentWidth, int parentHeight, StagedSplitBounds splitBoundsConfig, + int parentWidth, int parentHeight, SplitBounds splitBoundsConfig, DeviceProfile dp, boolean isRtl) { int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx; int totalThumbnailHeight = parentHeight - spaceAboveSnapshot; @@ -666,7 +666,7 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler { public void setSplitIconParams(View primaryIconView, View secondaryIconView, int taskIconHeight, int primarySnapshotWidth, int primarySnapshotHeight, int groupedTaskViewHeight, int groupedTaskViewWidth, boolean isRtl, - DeviceProfile deviceProfile, StagedSplitBounds splitConfig) { + DeviceProfile deviceProfile, SplitBounds splitConfig) { FrameLayout.LayoutParams primaryIconParams = (FrameLayout.LayoutParams) primaryIconView.getLayoutParams(); FrameLayout.LayoutParams secondaryIconParams = diff --git a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java index 71adb7ab7e..dff2c5d90f 100644 --- a/src/com/android/launcher3/touch/SeascapePagedViewHandler.java +++ b/src/com/android/launcher3/touch/SeascapePagedViewHandler.java @@ -39,7 +39,7 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.util.SplitConfigurationOptions.SplitPositionOption; -import com.android.launcher3.util.SplitConfigurationOptions.StagedSplitBounds; +import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds; import com.android.launcher3.views.BaseDragLayer; import java.util.Collections; @@ -110,7 +110,7 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler { @Override public Pair getDwbLayoutTranslations(int taskViewWidth, - int taskViewHeight, StagedSplitBounds splitBounds, DeviceProfile deviceProfile, + int taskViewHeight, SplitBounds splitBounds, DeviceProfile deviceProfile, View[] thumbnailViews, int desiredTaskId, View banner) { boolean isRtl = banner.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL; float translationX = 0; @@ -203,7 +203,7 @@ public class SeascapePagedViewHandler extends LandscapePagedViewHandler { public void setSplitIconParams(View primaryIconView, View secondaryIconView, int taskIconHeight, int primarySnapshotWidth, int primarySnapshotHeight, int groupedTaskViewHeight, int groupedTaskViewWidth, boolean isRtl, - DeviceProfile deviceProfile, StagedSplitBounds splitConfig) { + DeviceProfile deviceProfile, SplitBounds splitConfig) { super.setSplitIconParams(primaryIconView, secondaryIconView, taskIconHeight, primarySnapshotWidth, primarySnapshotHeight, groupedTaskViewHeight, groupedTaskViewWidth, isRtl, deviceProfile, splitConfig); diff --git a/src/com/android/launcher3/util/SplitConfigurationOptions.java b/src/com/android/launcher3/util/SplitConfigurationOptions.java index 6a336cce28..f14d9857f9 100644 --- a/src/com/android/launcher3/util/SplitConfigurationOptions.java +++ b/src/com/android/launcher3/util/SplitConfigurationOptions.java @@ -96,7 +96,7 @@ public final class SplitConfigurationOptions { * * If you make changes here, consider making the same changes there */ - public static class StagedSplitBounds { + public static class SplitBounds { public final Rect leftTopBounds; public final Rect rightBottomBounds; /** This rect represents the actual gap between the two apps */ @@ -124,7 +124,7 @@ public final class SplitConfigurationOptions { public final int leftTopTaskId; public final int rightBottomTaskId; - public StagedSplitBounds(Rect leftTopBounds, Rect rightBottomBounds, int leftTopTaskId, + public SplitBounds(Rect leftTopBounds, Rect rightBottomBounds, int leftTopTaskId, int rightBottomTaskId) { this.leftTopBounds = leftTopBounds; this.rightBottomBounds = rightBottomBounds; @@ -163,7 +163,7 @@ public final class SplitConfigurationOptions { } } - public static class StagedSplitTaskPosition { + public static class SplitStageInfo { public int taskId = -1; @StagePosition public int stagePosition = STAGE_POSITION_UNDEFINED;