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

Revert "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it."

Browse Source 
This reverts commit d23391eafe.

Change-Id: Id7211a0fd08b9bc8ad092501de3c3efa57bf8264
This commit is contained in:
Todd Volkert
2015-02-12 23:09:19 +00:00
parent d23391eafe
commit 455e0ea8f2
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1762,17 +1762,7 @@ public abstract class Transition implements Cloneable {
runAnimators();
}
/**
* 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 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 static VisibilityInfo getVisibilityChangeInfo(TransitionValues startValues,
private 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
protected boolean areValuesChanged(TransitionValues oldValues, TransitionValues newValues) {
boolean areValuesChanged(TransitionValues oldValues, TransitionValues newValues) {
if (oldValues == null && newValues == null) {
return false;
}