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

Commit 127fa3a4 authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

am b4035fd8: Merge "Properly cancel animators when View doesn\'t exist in... 

am b4035fd8: Merge "Properly cancel animators when View doesn\'t exist in starting state." into mnc-dev

* commit 'b4035fd8':
  Properly cancel animators when View doesn't exist in starting state.
parents c71ede4b b4035fd8

core/java/android/transition/Transition.java

+4 −0
Original line number Diff line number Diff line
@@ -1639,6 +1639,7 @@ public abstract class Transition implements Cloneable { 
        for (int i = 0; i < count; i++) {

            TransitionValues values = lookIn.get(i);

            if (values == null) {

                // Null values are always added to the end of the list, so we know to stop now.

                return null;

            }

            if (values.view == view) {
@@ -1742,6 +1743,9 @@ public abstract class Transition implements Cloneable { 
                    View oldView = oldInfo.view;

                    TransitionValues startValues = getTransitionValues(oldView, true);

                    TransitionValues endValues = getMatchedTransitionValues(oldView, true);

                    if (startValues == null && endValues == null) {

                        endValues = mEndValues.viewValues.get(oldView);

                    }

                    boolean cancel = (startValues != null || endValues != null) &&

                            oldInfo.transition.areValuesChanged(oldValues, endValues);

                    if (cancel) {