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

Increase visibility of Transition.areValuesChanged() to protected to allow

Browse Source 
subclasses outside the android.transition package to override it.

Change-Id: Ife5de79b339b6d7598411ad851858f4c52a89f5c
This commit is contained in:
Todd Volkert
2015-02-12 13:34:29 -08:00
parent 346066ef90
commit d23391eafe
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1762,7 +1762,17 @@ public abstract class Transition implements Cloneable {
runAnimators();
}
boolean areValuesChanged(TransitionValues oldValues, TransitionValues newValues) {
/**
* 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
* 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.
*
* @param oldValues the first set of values, may be {@code null}
* @param newValues the second set of values, may be {@code null}
*/
protected boolean areValuesChanged(TransitionValues oldValues, TransitionValues newValues) {
boolean valuesChanged = false;
// if oldValues null, then transition didn't care to stash values,
// and won't get canceled

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

@@ -182,7 +182,7 @@ public abstract class Visibility extends Transition {
return visibility == View.VISIBLE && parent != null;
}
private VisibilityInfo getVisibilityChangeInfo(TransitionValues startValues,
private static VisibilityInfo getVisibilityChangeInfo(TransitionValues startValues,
TransitionValues endValues) {
final VisibilityInfo visInfo = new VisibilityInfo();
visInfo.visibilityChange = false;
@@ -484,7 +484,7 @@ public abstract class Visibility extends Transition {
}
@Override
boolean areValuesChanged(TransitionValues oldValues, TransitionValues newValues) {
protected boolean areValuesChanged(TransitionValues oldValues, TransitionValues newValues) {
if (oldValues == null && newValues == null) {
return false;
}