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

Commit 843f5417 authored by Selim Cinek's avatar Selim Cinek
Browse files

Do animations correctly in systemUI 

When properties weren't changing, animators were not cancelled.
In addition did we still apply the delay even though animators
were running before.

Change-Id: I05fdd15d770900ac901eb95b616bed4cf311cd23
Fixes: 29540362
parent ce87a8af

packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java

+31 −6
Original line number Diff line number Diff line
@@ -225,16 +225,22 @@ public class StackStateAnimator { 
        // start height animation

        if (heightChanging) {

            startHeightAnimation(child, viewState, duration, delay);

        }  else {

            abortAnimation(child, TAG_ANIMATOR_HEIGHT);

        }



        // start shadow alpha animation

        if (shadowAlphaChanging) {

            startShadowAlphaAnimation(child, viewState, duration, delay);

        } else {

            abortAnimation(child, TAG_ANIMATOR_SHADOW_ALPHA);

        }



        // start top inset animation

        if (topInsetChanging) {

            startInsetAnimation(child, viewState, duration, delay);

        } else {

            abortAnimation(child, TAG_ANIMATOR_TOP_INSET);

        }



        // start dimmed animation
@@ -286,16 +292,29 @@ public class StackStateAnimator { 
        // start translationY animation

        if (yTranslationChanging) {

            startYTranslationAnimation(child, viewState, duration, delay);

        } else {

            abortAnimation(child, TAG_ANIMATOR_TRANSLATION_Y);

        }



        // start translationZ animation

        if (zTranslationChanging) {

            startZTranslationAnimation(child, viewState, duration, delay);

        } else {

            abortAnimation(child, TAG_ANIMATOR_TRANSLATION_Z);

        }



        // start alpha animation

        if (alphaChanging && child.getTranslationX() == 0) {

            startAlphaAnimation(child, viewState, duration, delay);

        }  else {

            abortAnimation(child, TAG_ANIMATOR_ALPHA);

        }

    }



    private void abortAnimation(View child, int animatorTag) {

        Animator previousAnimator = getChildTag(child, animatorTag);

        if (previousAnimator != null) {

            previousAnimator.cancel();

        }

    }
@@ -413,7 +432,8 @@ public class StackStateAnimator { 
        animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);

        long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator);

        animator.setDuration(newDuration);

        if (delay > 0 && (previousAnimator == null || !previousAnimator.isRunning())) {

        if (delay > 0 && (previousAnimator == null

                || previousAnimator.getAnimatedFraction() == 0)) {

            animator.setStartDelay(delay);

        }

        animator.addListener(getGlobalAnimationFinishedListener());
@@ -472,7 +492,8 @@ public class StackStateAnimator { 
        animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);

        long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator);

        animator.setDuration(newDuration);

        if (delay > 0 && (previousAnimator == null || !previousAnimator.isRunning())) {

        if (delay > 0 && (previousAnimator == null

                || previousAnimator.getAnimatedFraction() == 0)) {

            animator.setStartDelay(delay);

        }

        animator.addListener(getGlobalAnimationFinishedListener());
@@ -548,7 +569,8 @@ public class StackStateAnimator { 
        animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);

        long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator);

        animator.setDuration(newDuration);

        if (delay > 0 && (previousAnimator == null || !previousAnimator.isRunning())) {

        if (delay > 0 && (previousAnimator == null

                || previousAnimator.getAnimatedFraction() == 0)) {

            animator.setStartDelay(delay);

        }

        animator.addListener(getGlobalAnimationFinishedListener());
@@ -630,7 +652,8 @@ public class StackStateAnimator { 
        });

        long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator);

        animator.setDuration(newDuration);

        if (delay > 0 && (previousAnimator == null || !previousAnimator.isRunning())) {

        if (delay > 0 && (previousAnimator == null

                || previousAnimator.getAnimatedFraction() == 0)) {

            animator.setStartDelay(delay);

        }

        animator.addListener(getGlobalAnimationFinishedListener());
@@ -674,7 +697,8 @@ public class StackStateAnimator { 
        animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);

        long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator);

        animator.setDuration(newDuration);

        if (delay > 0 && (previousAnimator == null || !previousAnimator.isRunning())) {

        if (delay > 0 && (previousAnimator == null

                || previousAnimator.getAnimatedFraction() == 0)) {

            animator.setStartDelay(delay);

        }

        animator.addListener(getGlobalAnimationFinishedListener());
@@ -729,7 +753,8 @@ public class StackStateAnimator { 
        animator.setInterpolator(interpolator);

        long newDuration = cancelAnimatorAndGetNewDuration(duration, previousAnimator);

        animator.setDuration(newDuration);

        if (delay > 0 && (previousAnimator == null || !previousAnimator.isRunning())) {

        if (delay > 0 && (previousAnimator == null

                || previousAnimator.getAnimatedFraction() == 0)) {

            animator.setStartDelay(delay);

        }

        animator.addListener(getGlobalAnimationFinishedListener());