summaryrefslogtreecommitdiffstats
path: root/core/java/android/transition/TransitionInflater.java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2014-06-25 17:04:51 -0700
committerGeorge Mount <mount@google.com>2014-06-26 07:30:11 -0700
commit18ab79967ce8bcde4b1507164ac8186e5135622e (patch)
tree91ea606de28c36609f125e3e8b74fec258234b1b /core/java/android/transition/TransitionInflater.java
parent6507f2e03a90244e08fb62f9b55653ba3230d0b7 (diff)
downloadframeworks_base-18ab79967ce8bcde4b1507164ac8186e5135622e.zip
frameworks_base-18ab79967ce8bcde4b1507164ac8186e5135622e.tar.gz
frameworks_base-18ab79967ce8bcde4b1507164ac8186e5135622e.tar.bz2
Add IN/OUT flag for all Visibility transitions.
Bug 15758206 Change-Id: If9b1871117a6808c87adc84ab9215b913ebd2704
Diffstat (limited to 'core/java/android/transition/TransitionInflater.java')
-rw-r--r--core/java/android/transition/TransitionInflater.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/transition/TransitionInflater.java b/core/java/android/transition/TransitionInflater.java
index 58d743c..9e43201 100644
--- a/core/java/android/transition/TransitionInflater.java
+++ b/core/java/android/transition/TransitionInflater.java
@@ -349,6 +349,16 @@ public class TransitionInflater {
transition.setMatchOrder(parseMatchOrder(matchOrder));
}
a.recycle();
+ if (transition instanceof Visibility) {
+ a = mContext.obtainStyledAttributes(attrs,
+ com.android.internal.R.styleable.VisibilityTransition);
+ int mode = a.getInt(
+ com.android.internal.R.styleable.VisibilityTransition_visibilityMode, 0);
+ a.recycle();
+ if (mode != 0) {
+ ((Visibility)transition).setMode(mode);
+ }
+ }
return transition;
}