Merge "Rename CrossActivityAnimation to CrossActivityBackAnimation" into main (fe7c7765) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityAnimation.java→libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ import javax.inject.Inject;

		/** Class that defines cross-activity animation. */
		@ShellMainThread
		public class CrossActivityAnimation extends ShellBackAnimation {
		public class CrossActivityBackAnimation extends ShellBackAnimation {
		/**
		* Minimum scale of the entering/closing window.
		*/
		@@ -66,27 +66,27 @@ public class CrossActivityAnimation extends ShellBackAnimation {
		/** Duration of post animation after gesture committed. */
		private static final int POST_ANIMATION_DURATION = 350;
		private static final Interpolator INTERPOLATOR = new DecelerateInterpolator();
		private static final FloatProperty<CrossActivityAnimation> ENTER_PROGRESS_PROP =
		private static final FloatProperty<CrossActivityBackAnimation> ENTER_PROGRESS_PROP =
		new FloatProperty<>("enter-alpha") {
		@Override
		public void setValue(CrossActivityAnimation anim, float value) {
		public void setValue(CrossActivityBackAnimation anim, float value) {
		anim.setEnteringProgress(value);
		}

		@Override
		public Float get(CrossActivityAnimation object) {
		public Float get(CrossActivityBackAnimation object) {
		return object.getEnteringProgress();
		}
		};
		private static final FloatProperty<CrossActivityAnimation> LEAVE_PROGRESS_PROP =
		private static final FloatProperty<CrossActivityBackAnimation> LEAVE_PROGRESS_PROP =
		new FloatProperty<>("leave-alpha") {
		@Override
		public void setValue(CrossActivityAnimation anim, float value) {
		public void setValue(CrossActivityBackAnimation anim, float value) {
		anim.setLeavingProgress(value);
		}

		@Override
		public Float get(CrossActivityAnimation object) {
		public Float get(CrossActivityBackAnimation object) {
		return object.getLeavingProgress();
		}
		};
		@@ -135,7 +135,7 @@ public class CrossActivityAnimation extends ShellBackAnimation {
		private final BackAnimationBackground mBackground;

		@Inject
		public CrossActivityAnimation(Context context, BackAnimationBackground background) {
		public CrossActivityBackAnimation(Context context, BackAnimationBackground background) {
		mCornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context);
		mBackAnimationRunner = new BackAnimationRunner(
		new Callback(), new Runner(), context, CUJ_PREDICTIVE_BACK_CROSS_ACTIVITY);
		@@ -377,7 +377,7 @@ public class CrossActivityAnimation extends ShellBackAnimation {
		@Override
		public void onBackStarted(BackMotionEvent backEvent) {
		mProgressAnimator.onBackStarted(backEvent,
		CrossActivityAnimation.this::onGestureProgress);
		CrossActivityBackAnimation.this::onGestureProgress);
		}

		@Override

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/back/ShellBackAnimationModule.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		package com.android.wm.shell.dagger.back;

		import com.android.wm.shell.back.CrossActivityAnimation;
		import com.android.wm.shell.back.CrossActivityBackAnimation;
		import com.android.wm.shell.back.CrossTaskBackAnimation;
		import com.android.wm.shell.back.CustomizeActivityAnimation;
		import com.android.wm.shell.back.ShellBackAnimation;
		@@ -47,7 +47,7 @@ public interface ShellBackAnimationModule {
		@Binds
		@ShellBackAnimation.CrossActivity
		ShellBackAnimation bindCrossActivityShellBackAnimation(
		CrossActivityAnimation crossActivityAnimation);
		CrossActivityBackAnimation crossActivityBackAnimation);

		/** Default cross task back animation */
		@Binds

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ public class BackAnimationControllerTest extends ShellTestCase {
		mShellInit = spy(new ShellInit(mShellExecutor));
		mShellBackAnimationRegistry =
		new ShellBackAnimationRegistry(
		new CrossActivityAnimation(mContext, mAnimationBackground),
		new CrossActivityBackAnimation(mContext, mAnimationBackground),
		new CrossTaskBackAnimation(mContext, mAnimationBackground),
		/* dialogCloseAnimation= */ null,
		new CustomizeActivityAnimation(mContext, mAnimationBackground),
		@@ -534,7 +534,7 @@ public class BackAnimationControllerTest extends ShellTestCase {

		@Test
		public void testBackToActivity() throws RemoteException {
		final CrossActivityAnimation animation = new CrossActivityAnimation(mContext,
		final CrossActivityBackAnimation animation = new CrossActivityBackAnimation(mContext,
		mAnimationBackground);
		verifySystemBackBehavior(BackNavigationInfo.TYPE_CROSS_ACTIVITY, animation.getRunner());
		}