Merge "Adjust the animation timeout by the animation scale." into main (000258fc) · Commits · e / os / android_frameworks_base

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

+17 −3

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import static com.android.internal.jank.InteractionJankMonitor.CUJ_PREDICTIVE_BA
		import static com.android.window.flags.Flags.predictiveBackDelayWmTransition;
		import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BACK_PREVIEW;

		import android.animation.ValueAnimator;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SuppressLint;
		@@ -110,6 +111,9 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		* Max duration to wait for an animation to finish before triggering the real back.
		*/
		private static final long MAX_ANIMATION_DURATION = 2000;
		private long mMaxAnimationDuration = MAX_ANIMATION_DURATION;
		// Note: Must keep a reference when register to ValueAnimator.
		private final ValueAnimator.DurationScaleChangeListener mAnimationScaleChangeListener;
		private final LatencyTracker mLatencyTracker;
		@ShellMainThread private final Handler mHandler;

		@@ -162,7 +166,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont

		private final Runnable mAnimationTimeoutRunnable = () -> {
		ProtoLog.w(WM_SHELL_BACK_PREVIEW, "Animation didn't finish in %d ms. Resetting...",
		MAX_ANIMATION_DURATION);
		mMaxAnimationDuration);
		finishBackAnimation();
		};

		@@ -282,6 +286,8 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		mTransitions.registerObserver(mBackTransitionObserver);
		mBackTransitionObserver.setBackTransitionHandler(mBackTransitionHandler);
		updateTouchableArea();
		mAnimationScaleChangeListener = scale -> mShellExecutor.execute(
		this::updateAnimationScale);
		}

		private void onInit() {
		@@ -291,6 +297,14 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		mShellCommandHandler.addDumpCallback(this::dump, this);
		mShellController.addConfigurationChangeListener(this);
		registerBackGestureDelegate();
		ValueAnimator.registerDurationScaleChangeListener(mAnimationScaleChangeListener);
		updateAnimationScale();
		}

		private void updateAnimationScale() {
		final float scale = Math.max(Math.min(ValueAnimator.getDurationScale(), 20), 1);
		final double result = scale * MAX_ANIMATION_DURATION;
		mMaxAnimationDuration = Math.round(result);
		}

		public BackAnimation getBackAnimationImpl() {
		@@ -880,7 +894,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		ProtoLog.w(WM_SHELL_BACK_PREVIEW, "Gesture released, but animation didn't ready.");
		// Supposed it is in post commit animation state, and start the timeout to watch
		// if the animation is ready.
		mShellExecutor.executeDelayed(mAnimationTimeoutRunnable, MAX_ANIMATION_DURATION);
		mShellExecutor.executeDelayed(mAnimationTimeoutRunnable, mMaxAnimationDuration);
		return;
		}
		startPostCommitAnimation();
		@@ -898,7 +912,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		mShellExecutor.removeCallbacks(mAnimationTimeoutRunnable);
		ProtoLog.d(WM_SHELL_BACK_PREVIEW, "BackAnimationController: startPostCommitAnimation()");
		mPostCommitAnimationInProgress = true;
		mShellExecutor.executeDelayed(mAnimationTimeoutRunnable, MAX_ANIMATION_DURATION);
		mShellExecutor.executeDelayed(mAnimationTimeoutRunnable, mMaxAnimationDuration);

		// The next callback should be {@link #onBackAnimationFinished}.
		if (mCurrentTracker.getTriggerBack()) {