Merge master@5428150 into git_qt-dev-plus-aosp. (ef8a1156) · Commits · e / os / android_packages_apps_Trebuchet

go/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,8 +43,8 @@ public class OverviewState extends LauncherState {
		}

		@Override
		public float[] getOverviewScaleAndTranslationY(Launcher launcher) {
		return new float[] {1f, 0f};
		public ScaleAndTranslation getOverviewScaleAndTranslation(Launcher launcher) {
		return new ScaleAndTranslation(1f, 0f, 0f);
		}

		@Override

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/BackgroundAppState.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ public class BackgroundAppState extends OverviewState {
		}

		@Override
		public float[] getOverviewScaleAndTranslationY(Launcher launcher) {
		public ScaleAndTranslation getOverviewScaleAndTranslation(Launcher launcher) {
		// Initialize the recents view scale to what it would be when starting swipe up
		RecentsView recentsView = launcher.getOverviewPanel();
		recentsView.getTaskSize(sTempRect);
		@@ -71,7 +71,7 @@ public class BackgroundAppState extends OverviewState {
		}
		}
		float scale = (float) appWidth / sTempRect.width();
		return new float[] { scale, 0f };
		return new ScaleAndTranslation(scale, 0f, 0f);
		}

		@Override

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/FlingAndHoldTouchController.java

+19 −2

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController {

		super.onDragStart(start);

		if (mStartState == NORMAL) {
		if (handlingOverviewAnim()) {
		mMotionPauseDetector.setOnMotionPauseListener(isPaused -> {
		RecentsView recentsView = mLauncher.getOverviewPanel();
		recentsView.setOverviewStateEnabled(isPaused);
		@@ -55,6 +55,14 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController {
		}
		}

		/**
		* @return Whether we are handling the overview animation, rather than
		* having it as part of the existing animation to the target state.
		*/
		private boolean handlingOverviewAnim() {
		return mStartState == NORMAL;
		}

		@Override
		public boolean onDrag(float displacement) {
		mMotionPauseDetector.addPosition(displacement, 0);
		@@ -63,7 +71,7 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController {

		@Override
		public void onDragEnd(float velocity, boolean fling) {
		if (mMotionPauseDetector.isPaused() && mStartState == NORMAL) {
		if (mMotionPauseDetector.isPaused() && handlingOverviewAnim()) {
		float range = getShiftRange();
		long maxAccuracy = (long) (2 * range);

		@@ -93,4 +101,13 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController {
		}
		mMotionPauseDetector.clear();
		}

		@Override
		protected void updateAnimatorBuilderOnReinit(AnimatorSetBuilder builder) {
		if (handlingOverviewAnim()) {
		// We don't want the state transition to all apps to animate overview,
		// as that will cause a jump after our atomic animation.
		builder.addFlag(AnimatorSetBuilder.FLAG_DONT_ANIMATE_OVERVIEW);
		}
		}
		}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ public class OverviewState extends LauncherState {
		}

		@Override
		public float[] getWorkspaceScaleAndTranslation(Launcher launcher) {
		public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) {
		RecentsView recentsView = launcher.getOverviewPanel();
		Workspace workspace = launcher.getWorkspace();
		View workspacePage = workspace.getPageAt(workspace.getCurrentPage());
		@@ -65,12 +65,12 @@ public class OverviewState extends LauncherState {
		recentsView.getTaskSize(sTempRect);
		float scale = (float) sTempRect.width() / workspacePageWidth;
		float parallaxFactor = 0.5f;
		return new float[]{scale, 0, -getDefaultSwipeHeight(launcher) * parallaxFactor};
		return new ScaleAndTranslation(scale, 0, -getDefaultSwipeHeight(launcher) * parallaxFactor);
		}

		@Override
		public float[] getOverviewScaleAndTranslationY(Launcher launcher) {
		return new float[] {1f, 0f};
		public ScaleAndTranslation getOverviewScaleAndTranslation(Launcher launcher) {
		return new ScaleAndTranslation(1f, 0f, 0f);
		}

		@Override

quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityControllerHelper.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,8 @@ public final class FallbackActivityControllerHelper implements
		@Override
		public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect) {
		LayoutUtils.calculateFallbackTaskSize(context, dp, outRect);
		if (dp.isVerticalBarLayout()) {
		if (dp.isVerticalBarLayout()
		&& !NavBarModeOverlayResourceObserver.isEdgeToEdgeModeEnabled(context)) {
		Rect targetInsets = dp.getInsets();
		int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right;
		return dp.hotseatBarSizePx + hotseatInset;