Merge "Explicitly set X and Y values when offsetting split tasks" into sc-v2-dev am: 8b30227f58

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15799376

Change-Id: I99ce877402cf1d2a6ba9863a561a242eaed780b2
This commit is contained in:
TreeHugger Robot
2021-09-10 18:20:38 +00:00
committed by Automerger Merge Worker
2 changed files with 7 additions and 5 deletions
@@ -89,13 +89,13 @@ public abstract class SwipeUpAnimationLogic implements
LauncherSplitScreenListener.INSTANCE.getNoCreate()
.getRunningSplitTaskIds().length > 1;
TaskViewSimulator primaryTVS = new TaskViewSimulator(context,
gestureState.getActivityInterface());
primaryTVS.getOrientationState().update(
mDeviceState.getRotationTouchHelper().getCurrentActiveRotation(),
mDeviceState.getRotationTouchHelper().getDisplayRotation());
mTargetGluer = new RemoteTargetGluer(mContext, mGestureState.getActivityInterface());
mRemoteTargetHandles = mTargetGluer.getRemoteTargetHandles();
runActionOnRemoteHandles(remoteTargetHandle ->
remoteTargetHandle.getTaskViewSimulator().getOrientationState().update(
mDeviceState.getRotationTouchHelper().getCurrentActiveRotation(),
mDeviceState.getRotationTouchHelper().getDisplayRotation()
));
}
protected void initTransitionEndpoints(DeviceProfile dp) {
@@ -503,9 +503,11 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
if (dp.isLandscape) {
splitOffset.x = splitInfo.leftTopBounds.width() +
splitInfo.visualDividerBounds.width();
splitOffset.y = 0;
} else {
splitOffset.y = splitInfo.leftTopBounds.height() +
splitInfo.visualDividerBounds.height();
splitOffset.x = 0;
}
}
}