diff options
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/back/DefaultCrossActivityBackAnimation.kt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/DefaultCrossActivityBackAnimation.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/back/DefaultCrossActivityBackAnimation.kt index 44752fe0fa72..b377a42b911c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/DefaultCrossActivityBackAnimation.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/DefaultCrossActivityBackAnimation.kt @@ -43,7 +43,7 @@ constructor( Choreographer.getInstance() ) { - private val postCommitInterpolator = Interpolators.FAST_OUT_SLOW_IN + private val postCommitInterpolator = Interpolators.EMPHASIZED private val enteringStartOffset = context.resources.getDimension(R.dimen.cross_activity_back_entering_start_offset) override val allowEnteringYShift = true @@ -87,7 +87,7 @@ constructor( override fun onPostCommitProgress(linearProgress: Float) { super.onPostCommitProgress(linearProgress) - val closingAlpha = max(1f - linearProgress * 2, 0f) + val closingAlpha = max(1f - linearProgress * 5, 0f) val progress = postCommitInterpolator.getInterpolation(linearProgress) currentClosingRect.setInterpolatedRectF(startClosingRect, targetClosingRect, progress) applyTransform(closingTarget?.leash, currentClosingRect, closingAlpha) @@ -98,6 +98,6 @@ constructor( companion object { - private const val POST_COMMIT_DURATION = 300L + private const val POST_COMMIT_DURATION = 450L } } |