Merge "Fix flicker in cross-activity-back-animation" into main (f161171e) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityBackAnimation.kt

+3 −0

Original line number	Diff line number	Diff line
		@@ -324,6 +324,7 @@ abstract class CrossActivityBackAnimation(
		enteringHasSameLetterbox = false
		lastPostCommitFlingScale = SPRING_SCALE
		gestureProgress = 0f
		triggerBack = false
		}

		protected fun applyTransform(
		@@ -499,10 +500,12 @@ abstract class CrossActivityBackAnimation(
		}

		override fun onBackCancelled() {
		triggerBack = false
		progressAnimator.onBackCancelled { finishAnimation() }
		}

		override fun onBackInvoked() {
		triggerBack = true
		progressAnimator.reset()
		onGestureCommitted(progressAnimator.velocity)
		}