Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 488e4093 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Recents TV: Do not allow negative delay am: a4a4763f am: f9ea8464"...

Merge "Recents TV: Do not allow negative delay am: a4a4763f am: f9ea8464" into nyc-mr1-dev-plus-aosp
parents f42ec107 3c0d4b4f
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -47,12 +47,13 @@ public class HomeRecentsEnterExitAnimationHolder {
    public void startEnterAnimation(boolean isPipShown) {
        for(int i = 0; i < mGridView.getChildCount(); i++) {
            TaskCardView view = (TaskCardView) mGridView.getChildAt(i);
            long delay = Math.max(mDelay * i, 0);
            view.setTranslationX(-mTranslationX);
            view.animate()
                    .alpha(isPipShown ? mDimAlpha : 1.0f)
                    .translationX(0)
                    .setDuration(mDuration)
                    .setStartDelay(mDelay * i)
                    .setStartDelay(delay)
                    .setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
        }
    }
@@ -60,11 +61,12 @@ public class HomeRecentsEnterExitAnimationHolder {
    public void startExitAnimation(DismissRecentsToHomeAnimationStarted dismissEvent) {
        for(int i = mGridView.getChildCount() - 1; i >= 0; i--) {
            TaskCardView view = (TaskCardView) mGridView.getChildAt(i);
            long delay = Math.max(mDelay * (mGridView.getChildCount() - 1 - i), 0);
            view.animate()
                    .alpha(0.0f)
                    .translationXBy(-mTranslationX)
                    .setDuration(mDuration)
                    .setStartDelay(mDelay * (mGridView.getChildCount() - 1 - i))
                    .setStartDelay(delay)
                    .setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
            if(i == 0) {
                view.animate().setListener(dismissEvent.getAnimationTrigger()