Merge "Explicitly set X and Y values when offsetting split tasks" into sc-v2-dev (8b30227f) · Commits · e / os / android_packages_apps_Trebuchet

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -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) {

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}
		}