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

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

Browse Source
This commit is contained in:
George Mount
2015-05-07 20:22:59 +00:00
committed by Android (Google) Code Review
parent 2d9ef99a4e 1b4ae634f6
commit b4035fd886
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/transition/Transition.java
View File

@@ -1639,6 +1639,7 @@ public abstract class Transition implements Cloneable {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
TransitionValues values = lookIn.get(i); TransitionValues values = lookIn.get(i);
if (values == null) { if (values == null) {
// Null values are always added to the end of the list, so we know to stop now.
return null; return null;
} }
if (values.view == view) { if (values.view == view) {
@@ -1742,6 +1743,9 @@ public abstract class Transition implements Cloneable {
View oldView = oldInfo.view; View oldView = oldInfo.view;
TransitionValues startValues = getTransitionValues(oldView, true); TransitionValues startValues = getTransitionValues(oldView, true);
TransitionValues endValues = getMatchedTransitionValues(oldView, true); TransitionValues endValues = getMatchedTransitionValues(oldView, true);
if (startValues == null && endValues == null) {
endValues = mEndValues.viewValues.get(oldView);
}
boolean cancel = (startValues != null || endValues != null) && boolean cancel = (startValues != null || endValues != null) &&
oldInfo.transition.areValuesChanged(oldValues, endValues); oldInfo.transition.areValuesChanged(oldValues, endValues);
if (cancel) { if (cancel) {