summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
-rw-r--r--core/java/android/transition/Transition.java31
-rw-r--r--core/java/android/transition/Visibility.java10
4 files changed, 25 insertions, 20 deletions
diff --git a/api/current.txt b/api/current.txt
index aa5f141..5bea564 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -33776,7 +33776,6 @@ package android.transition {
method public android.transition.Transition addTarget(java.lang.String);
method public android.transition.Transition addTarget(java.lang.Class);
method public android.transition.Transition addTarget(android.view.View);
- method protected boolean areValuesChanged(android.transition.TransitionValues, android.transition.TransitionValues);
method public boolean canRemoveViews();
method public abstract void captureEndValues(android.transition.TransitionValues);
method public abstract void captureStartValues(android.transition.TransitionValues);
@@ -33803,6 +33802,7 @@ package android.transition {
method public java.util.List<android.view.View> getTargets();
method public java.lang.String[] getTransitionProperties();
method public android.transition.TransitionValues getTransitionValues(android.view.View, boolean);
+ method public boolean isTransitionRequired(android.transition.TransitionValues, android.transition.TransitionValues);
method public android.transition.Transition removeListener(android.transition.Transition.TransitionListener);
method public android.transition.Transition removeTarget(int);
method public android.transition.Transition removeTarget(java.lang.String);
diff --git a/api/system-current.txt b/api/system-current.txt
index de9643c..d67ffe1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -36041,7 +36041,6 @@ package android.transition {
method public android.transition.Transition addTarget(java.lang.String);
method public android.transition.Transition addTarget(java.lang.Class);
method public android.transition.Transition addTarget(android.view.View);
- method protected boolean areValuesChanged(android.transition.TransitionValues, android.transition.TransitionValues);
method public boolean canRemoveViews();
method public abstract void captureEndValues(android.transition.TransitionValues);
method public abstract void captureStartValues(android.transition.TransitionValues);
@@ -36068,6 +36067,7 @@ package android.transition {
method public java.util.List<android.view.View> getTargets();
method public java.lang.String[] getTransitionProperties();
method public android.transition.TransitionValues getTransitionValues(android.view.View, boolean);
+ method public boolean isTransitionRequired(android.transition.TransitionValues, android.transition.TransitionValues);
method public android.transition.Transition removeListener(android.transition.Transition.TransitionListener);
method public android.transition.Transition removeTarget(int);
method public android.transition.Transition removeTarget(java.lang.String);
diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java
index 1b25505..c61ca4e 100644
--- a/core/java/android/transition/Transition.java
+++ b/core/java/android/transition/Transition.java
@@ -19,6 +19,7 @@ package android.transition;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.TimeInterpolator;
+import android.annotation.Nullable;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Path;
@@ -700,7 +701,7 @@ public abstract class Transition implements Cloneable {
continue;
}
// Only bother trying to animate with values that differ between start/end
- boolean isChanged = start == null || end == null || areValuesChanged(start, end);
+ boolean isChanged = start == null || end == null || isTransitionRequired(start, end);
if (isChanged) {
if (DBG) {
View view = (end != null) ? end.view : start.view;
@@ -1747,7 +1748,7 @@ public abstract class Transition implements Cloneable {
endValues = mEndValues.viewValues.get(oldView);
}
boolean cancel = (startValues != null || endValues != null) &&
- oldInfo.transition.areValuesChanged(oldValues, endValues);
+ oldInfo.transition.isTransitionRequired(oldValues, endValues);
if (cancel) {
if (anim.isRunning() || anim.isStarted()) {
if (DBG) {
@@ -1770,32 +1771,36 @@ public abstract class Transition implements Cloneable {
}
/**
- * Returns whether transition values have changed between the start scene and the end scene
- * (thus determining whether animation is required). The default implementation compares the
+ * Returns whether or not the transition should create an Animator, based on the values
+ * captured during {@link #captureStartValues(TransitionValues)} and
+ * {@link #captureEndValues(TransitionValues)}. The default implementation compares the
* property values returned from {@link #getTransitionProperties()}, or all property values if
* {@code getTransitionProperties()} returns null. Subclasses may override this method to
- * provide logic more specific to their transition implementation.
+ * provide logic more specific to the transition implementation.
*
- * @param oldValues the first set of values, may be {@code null}
- * @param newValues the second set of values, may be {@code null}
+ * @param startValues the values from captureStartValues, This may be {@code null} if the
+ * View did not exist in the start state.
+ * @param endValues the values from captureEndValues. This may be {@code null} if the View
+ * did not exist in the end state.
*/
- protected boolean areValuesChanged(TransitionValues oldValues, TransitionValues newValues) {
+ public boolean isTransitionRequired(@Nullable TransitionValues startValues,
+ @Nullable TransitionValues endValues) {
boolean valuesChanged = false;
- // if oldValues null, then transition didn't care to stash values,
+ // if startValues null, then transition didn't care to stash values,
// and won't get canceled
- if (oldValues != null && newValues != null) {
+ if (startValues != null && endValues != null) {
String[] properties = getTransitionProperties();
if (properties != null) {
int count = properties.length;
for (int i = 0; i < count; i++) {
- if (isValueChanged(oldValues, newValues, properties[i])) {
+ if (isValueChanged(startValues, endValues, properties[i])) {
valuesChanged = true;
break;
}
}
} else {
- for (String key : oldValues.values.keySet()) {
- if (isValueChanged(oldValues, newValues, key)) {
+ for (String key : startValues.values.keySet()) {
+ if (isValueChanged(startValues, endValues, key)) {
valuesChanged = true;
break;
}
diff --git a/core/java/android/transition/Visibility.java b/core/java/android/transition/Visibility.java
index 684c59e..bac668a 100644
--- a/core/java/android/transition/Visibility.java
+++ b/core/java/android/transition/Visibility.java
@@ -462,18 +462,18 @@ public abstract class Visibility extends Transition {
}
@Override
- protected boolean areValuesChanged(TransitionValues oldValues, TransitionValues newValues) {
- if (oldValues == null && newValues == null) {
+ public boolean isTransitionRequired(TransitionValues startValues, TransitionValues newValues) {
+ if (startValues == null && newValues == null) {
return false;
}
- if (oldValues != null && newValues != null &&
+ if (startValues != null && newValues != null &&
newValues.values.containsKey(PROPNAME_VISIBILITY) !=
- oldValues.values.containsKey(PROPNAME_VISIBILITY)) {
+ startValues.values.containsKey(PROPNAME_VISIBILITY)) {
// The transition wasn't targeted in either the start or end, so it couldn't
// have changed.
return false;
}
- VisibilityInfo changeInfo = getVisibilityChangeInfo(oldValues, newValues);
+ VisibilityInfo changeInfo = getVisibilityChangeInfo(startValues, newValues);
return changeInfo.visibilityChange && (changeInfo.startVisibility == View.VISIBLE ||
changeInfo.endVisibility == View.VISIBLE);
}
generated by cgit v1.1 at 2024-06-03 18:52:17 +0000