summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2014-11-18 15:29:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-18 15:29:48 +0000
commit6cb51968c205e84d6ba730d73c3aaf00ccf8c649 (patch)
treedf2b61d593a3e63ef20c61f19947326e3785cfb9 /core/java
parent1ca6af34b48b18b8c4b5e2cdf3f1bd4295d8ac2e (diff)
parent20559079ab05aa5e976bb0f7aa63fd9e6868f02e (diff)
downloadframeworks_base-6cb51968c205e84d6ba730d73c3aaf00ccf8c649.zip
frameworks_base-6cb51968c205e84d6ba730d73c3aaf00ccf8c649.tar.gz
frameworks_base-6cb51968c205e84d6ba730d73c3aaf00ccf8c649.tar.bz2
Merge "Fix Visibility transitions canceling when nothing has changed." into lmp-mr1-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/transition/Visibility.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/transition/Visibility.java b/core/java/android/transition/Visibility.java
index 36bac31..8779229 100644
--- a/core/java/android/transition/Visibility.java
+++ b/core/java/android/transition/Visibility.java
@@ -63,6 +63,7 @@ public abstract class Visibility extends Transition {
private static final String[] sTransitionProperties = {
PROPNAME_VISIBILITY,
+ PROPNAME_PARENT,
};
private static class VisibilityInfo {