Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update snapshot fade out animation" into sc-v2-dev

Browse Source
This commit is contained in:
Chris Li
2021-09-25 00:03:41 +00:00
committed by Android (Google) Code Review
parent 1ee1dd38a0 2a332e4a2b
commit e3b0391814
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentAnimationSpec.java
View File

@@ -32,6 +32,7 @@ import android.view.animation.AnimationSet;
import android.view.animation.AnimationUtils; import android.view.animation.AnimationUtils;
import android.view.animation.ClipRectAnimation; import android.view.animation.ClipRectAnimation;
import android.view.animation.Interpolator; import android.view.animation.Interpolator;
import android.view.animation.LinearInterpolator;
import android.view.animation.ScaleAnimation; import android.view.animation.ScaleAnimation;
import android.view.animation.TranslateAnimation; import android.view.animation.TranslateAnimation;
@@ -46,12 +47,13 @@ class TaskFragmentAnimationSpec {
private static final String TAG = "TaskFragAnimationSpec"; private static final String TAG = "TaskFragAnimationSpec";
private static final int CHANGE_ANIMATION_DURATION = 517; private static final int CHANGE_ANIMATION_DURATION = 517;
private static final int CHANGE_ANIMATION_FADE_DURATION = 82; private static final int CHANGE_ANIMATION_FADE_DURATION = 80;
private static final int CHANGE_ANIMATION_FADE_OFFSET = 67; private static final int CHANGE_ANIMATION_FADE_OFFSET = 30;
private final Context mContext; private final Context mContext;
private final TransitionAnimation mTransitionAnimation; private final TransitionAnimation mTransitionAnimation;
private final Interpolator mFastOutExtraSlowInInterpolator; private final Interpolator mFastOutExtraSlowInInterpolator;
private final LinearInterpolator mLinearInterpolator;
private float mTransitionAnimationScaleSetting; private float mTransitionAnimationScaleSetting;
TaskFragmentAnimationSpec(@NonNull Handler handler) { TaskFragmentAnimationSpec(@NonNull Handler handler) {
@@ -61,6 +63,7 @@ class TaskFragmentAnimationSpec {
AttributeCache.init(mContext); AttributeCache.init(mContext);
mFastOutExtraSlowInInterpolator = AnimationUtils.loadInterpolator( mFastOutExtraSlowInInterpolator = AnimationUtils.loadInterpolator(
mContext, android.R.interpolator.fast_out_extra_slow_in); mContext, android.R.interpolator.fast_out_extra_slow_in);
mLinearInterpolator = new LinearInterpolator();
// The transition animation should be adjusted based on the developer option. // The transition animation should be adjusted based on the developer option.
final ContentResolver resolver = mContext.getContentResolver(); final ContentResolver resolver = mContext.getContentResolver();
@@ -129,14 +132,15 @@ class TaskFragmentAnimationSpec {
float startScaleY = 1.f / scaleY; float startScaleY = 1.f / scaleY;
// The start leash will be fade out. // The start leash will be fade out.
final AnimationSet startSet = new AnimationSet(true /* shareInterpolator */); final AnimationSet startSet = new AnimationSet(false /* shareInterpolator */);
startSet.setInterpolator(mFastOutExtraSlowInInterpolator);
final Animation startAlpha = new AlphaAnimation(1f, 0f); final Animation startAlpha = new AlphaAnimation(1f, 0f);
startAlpha.setInterpolator(mLinearInterpolator);
startAlpha.setDuration(CHANGE_ANIMATION_FADE_DURATION); startAlpha.setDuration(CHANGE_ANIMATION_FADE_DURATION);
startAlpha.setStartOffset(CHANGE_ANIMATION_FADE_OFFSET); startAlpha.setStartOffset(CHANGE_ANIMATION_FADE_OFFSET);
startSet.addAnimation(startAlpha); startSet.addAnimation(startAlpha);
final Animation startScale = new ScaleAnimation(startScaleX, startScaleX, startScaleY, final Animation startScale = new ScaleAnimation(startScaleX, startScaleX, startScaleY,
startScaleY); startScaleY);
startScale.setInterpolator(mFastOutExtraSlowInInterpolator);
startScale.setDuration(CHANGE_ANIMATION_DURATION); startScale.setDuration(CHANGE_ANIMATION_DURATION);
startSet.addAnimation(startScale); startSet.addAnimation(startScale);
startSet.initialize(startBounds.width(), startBounds.height(), endBounds.width(), startSet.initialize(startBounds.width(), startBounds.height(), endBounds.width(),