Merge "Moving TransformParams to an separate class." into ub-launcher3-rvc-dev (0e0bcc76) · Commits · e / os / android_packages_apps_Trebuchet

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -36,8 +36,8 @@ import com.android.launcher3.BaseDraggingActivity;
		import com.android.launcher3.anim.AnimationSuccessListener;
		import com.android.launcher3.statehandlers.DepthController;
		import com.android.quickstep.util.AppWindowAnimationHelper;
		import com.android.quickstep.util.AppWindowAnimationHelper.TransformParams;
		import com.android.quickstep.util.RemoteAnimationProvider;
		import com.android.quickstep.util.TransformParams;
		import com.android.quickstep.views.RecentsView;
		import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
		import com.android.systemui.shared.system.SyncRtSurfaceTransactionApplierCompat;
		@@ -164,9 +164,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> exten
		valueAnimator.setDuration(RECENTS_LAUNCH_DURATION);
		valueAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR);
		valueAnimator.addUpdateListener((v) -> {
		params.setProgress((float) v.getAnimatedValue())
		.setTargetSet(targets)
		.setLauncherOnTop(true);
		params.setProgress((float) v.getAnimatedValue()).setTargetSet(targets);
		clipHelper.applyTransform(params);
		});

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

+4 −7

Original line number	Diff line number	Diff line
		@@ -52,9 +52,9 @@ import com.android.quickstep.RecentsAnimationCallbacks.RecentsAnimationListener;
		import com.android.quickstep.util.ActiveGestureLog;
		import com.android.quickstep.util.ActivityInitListener;
		import com.android.quickstep.util.AppWindowAnimationHelper;
		import com.android.quickstep.util.AppWindowAnimationHelper.TransformParams;
		import com.android.quickstep.util.RecentsOrientedState;
		import com.android.quickstep.util.RectFSpringAnim;
		import com.android.quickstep.util.TransformParams;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;
		import com.android.systemui.shared.recents.model.ThumbnailData;
		@@ -424,8 +424,7 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten
		.setProgress(shift)
		.setOffset(offset)
		.setOffsetScale(offsetScale)
		.setTargetSet(mRecentsAnimationTargets)
		.setLauncherOnTop(true);
		.setTargetSet(mRecentsAnimationTargets);
		mAppWindowAnimationHelper.applyTransform(mTransformParams);
		}

		@@ -453,11 +452,9 @@ public abstract class BaseSwipeUpHandler<T extends BaseDraggingActivity, Q exten
		final RectF targetRect = homeAnimationFactory.getWindowTargetRect();
		final View floatingView = homeAnimationFactory.getFloatingView();
		final boolean isFloatingIconView = floatingView instanceof FloatingIconView;
		final RectF startRect = new RectF(
		mAppWindowAnimationHelper.applyTransform(
		final RectF startRect = new RectF(mAppWindowAnimationHelper.applyTransform(
		mTransformParams.setProgress(startProgress)
		.setTargetSet(mRecentsAnimationTargets)
		.setLauncherOnTop(false)));
		.setTargetSet(mRecentsAnimationTargets)));
		if (isFloatingIconView) {
		mOrientedState.mapInverseRectFromNormalOrientation(
		startRect, mDp.widthPx, mDp.heightPx);

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -118,9 +118,9 @@ public class FallbackSwipeHandler extends BaseSwipeUpHandler<RecentsActivity, Fa
		// Keep the home launcher invisible until we decide to land there.
		mLauncherAlpha.value = mRunningOverHome ? 1 : 0;
		if (mSwipeUpOverHome) {
		mAppWindowAnimationHelper.setBaseAlphaCallback((t, a) -> 1 - mLauncherAlpha.value);
		mTransformParams.setBaseAlphaCallback((t, a) -> 1 - mLauncherAlpha.value);
		} else {
		mAppWindowAnimationHelper.setBaseAlphaCallback((t, a) -> mLauncherAlpha.value);
		mTransformParams.setBaseAlphaCallback((t, a) -> mLauncherAlpha.value);
		}

		// Going home has an extra long progress to ensure that it animates into the screen

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

+3 −6

Original line number	Diff line number	Diff line
		@@ -80,11 +80,11 @@ import com.android.quickstep.BaseActivityInterface.HomeAnimationFactory;
		import com.android.quickstep.GestureState.GestureEndTarget;
		import com.android.quickstep.inputconsumers.OverviewInputConsumer;
		import com.android.quickstep.util.ActiveGestureLog;
		import com.android.quickstep.util.AppWindowAnimationHelper.TargetAlphaProvider;
		import com.android.quickstep.util.RectFSpringAnim;
		import com.android.quickstep.util.ShelfPeekAnim;
		import com.android.quickstep.util.ShelfPeekAnim.ShelfAnimState;
		import com.android.quickstep.util.TaskViewSimulator;
		import com.android.quickstep.util.TransformParams.TargetAlphaProvider;
		import com.android.quickstep.views.LiveTileOverlay;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;
		@@ -605,9 +605,7 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity>
		if (mWindowTransitionController != null) {
		float progress = mCurrentShift.value / mDragLengthFactor;
		mWindowTransitionController.setPlayFraction(progress);
		mTransformParams
		.setTargetSet(mRecentsAnimationTargets)
		.setLauncherOnTop(true);
		mTransformParams.setTargetSet(mRecentsAnimationTargets);

		mTaskViewSimulator.setScroll(mRecentsView == null ? 0 : mRecentsView.getScrollOffset());
		mTaskViewSimulator.apply(mTransformParams);
		@@ -1337,8 +1335,7 @@ public class LauncherSwipeHandler<T extends BaseDraggingActivity>
		}

		private void setTargetAlphaProvider(TargetAlphaProvider provider) {
		mAppWindowAnimationHelper.setTaskAlphaCallback(provider);
		mTaskViewSimulator.setTaskAlphaCallback(provider);
		mTransformParams.setTaskAlphaCallback(provider);
		updateFinalShift();
		}

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import com.android.launcher3.model.data.ItemInfo;
		import com.android.launcher3.statehandlers.DepthController;
		import com.android.quickstep.util.AppWindowAnimationHelper;
		import com.android.quickstep.util.MultiValueUpdateListener;
		import com.android.quickstep.util.TransformParams;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;
		import com.android.systemui.shared.recents.model.Task;
		@@ -132,11 +133,10 @@ public final class TaskViewUtils {
		final RemoteAnimationTargets targets =
		new RemoteAnimationTargets(appTargets, wallpaperTargets, MODE_OPENING);
		targets.addDependentTransactionApplier(applier);
		AppWindowAnimationHelper.TransformParams params =
		new AppWindowAnimationHelper.TransformParams()
		TransformParams params =
		new TransformParams()
		.setSyncTransactionApplier(applier)
		.setTargetSet(targets)
		.setLauncherOnTop(true);
		.setTargetSet(targets);

		AnimatorSet animatorSet = new AnimatorSet();
		final RecentsView recentsView = v.getRecentsView();
		@@ -150,7 +150,7 @@ public final class TaskViewUtils {
		final RectF mThumbnailRect;

		{
		inOutHelper.setTaskAlphaCallback((t, alpha) -> mTaskAlpha.value);
		params.setTaskAlphaCallback((t, alpha) -> mTaskAlpha.value);
		inOutHelper.prepareAnimation(
		BaseActivity.fromContext(v.getContext()).getDeviceProfile());
		inOutHelper.fromTaskThumbnailView(v.getThumbnail(), (RecentsView) v.getParent(),
		@@ -175,7 +175,7 @@ public final class TaskViewUtils {
		v.getRecentsView().getClipAnimationHelper();
		if (liveTileAnimationHelper != null) {
		// Append the surface transform params for the live tile app.
		AppWindowAnimationHelper.TransformParams liveTileParams =
		TransformParams liveTileParams =
		v.getRecentsView().getLiveTileParams(true /* mightNeedToRefill */);
		if (liveTileParams != null) {
		SurfaceParams[] liveTileSurfaceParams =
		@@ -186,7 +186,7 @@ public final class TaskViewUtils {
		}
		}
		// Apply surface transform using the surface params list.
		AppWindowAnimationHelper.applySurfaceParams(params.getSyncTransactionApplier(),
		params.applySurfaceParams(
		surfaceParamsList.toArray(new SurfaceParams[surfaceParamsList.size()]));
		// Get the task bounds for the app that's being opened after surface transform
		// update.