commit fddd7ead7c92fff87edcc6f0a7d8a1ad6a9a18d4
author Todd Volkert <tvolkert@google.com> Thu Feb 12 23:11:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 12 23:11:15 2015 +0000
tree 2b0443778f446ed62174af3633d69cf14fe3e540
parent 028e986c4cd55b7877f2450f6e6c774b821a0a31
parent 455e0ea8f2cbfc05fe420f0ea82f4ead10fa41af

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

core/java/android/transition/Transition.java

diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java
index c942042..2705bcf 100644
--- a/core/java/android/transition/Transition.java
+++ b/core/java/android/transition/Transition.java
@@ -1762,17 +1762,7 @@
         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

core/java/android/transition/Visibility.java

diff --git a/core/java/android/transition/Visibility.java b/core/java/android/transition/Visibility.java
index 26dca43..8779229 100644
--- a/core/java/android/transition/Visibility.java
+++ b/core/java/android/transition/Visibility.java
@@ -182,7 +182,7 @@
         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 @@
     }
 
     @Override
-    protected boolean areValuesChanged(TransitionValues oldValues, TransitionValues newValues) {
+    boolean areValuesChanged(TransitionValues oldValues, TransitionValues newValues) {
         if (oldValues == null && newValues == null) {
             return false;
         }