diff options
| author | Todd Volkert <tvolkert@google.com> | 2015-02-12 22:52:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-12 22:52:21 +0000 |
| commit | 09247179cba6cb027388cee361291b3ac4a547a7 (patch) | |
| tree | 4248c8f80362950eb2ca911c7576bad5e1255be5 /core/java/android/transition/Visibility.java | |
| parent | 2ed8acbbdb0102e4b4afb7fd00ab918cdac7d8d9 (diff) | |
| parent | d23391eafe9f46ff01d5dc936126a4d6ae1c53d3 (diff) | |
| download | frameworks_base-09247179cba6cb027388cee361291b3ac4a547a7.zip frameworks_base-09247179cba6cb027388cee361291b3ac4a547a7.tar.gz frameworks_base-09247179cba6cb027388cee361291b3ac4a547a7.tar.bz2 | |
Merge "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it."
Diffstat (limited to 'core/java/android/transition/Visibility.java')
| -rw-r--r-- | core/java/android/transition/Visibility.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/transition/Visibility.java b/core/java/android/transition/Visibility.java index 8779229..26dca43 100644 --- a/core/java/android/transition/Visibility.java +++ b/core/java/android/transition/Visibility.java @@ -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; } |
