diff options
author | George Mount <mount@google.com> | 2013-12-13 13:35:36 -0800 |
---|---|---|
committer | George Mount <mount@google.com> | 2014-02-04 16:18:43 -0800 |
commit | 0a778eda690a66173733a63622886e888d405c45 (patch) | |
tree | 119e10c352421b7035ab423eee7fb88156fe31ec /core/java/android/transition/Transition.java | |
parent | 143b46d50c0c01970c7d280228bd1e58c2afb32b (diff) | |
download | frameworks_base-0a778eda690a66173733a63622886e888d405c45.zip frameworks_base-0a778eda690a66173733a63622886e888d405c45.tar.gz frameworks_base-0a778eda690a66173733a63622886e888d405c45.tar.bz2 |
Cross-Activity Scene transition API.
First pass at API for cross-Activity Scene transitions.
Remaining work:
Transition back
Automatically capture hero element info
Transfer of surface texture to synchronize between Activities
Possibly use scene names to indicate preferred transition
Change-Id: I59d07de1fae694a46b92b1c82525daa301ec1377
Diffstat (limited to 'core/java/android/transition/Transition.java')
-rw-r--r-- | core/java/android/transition/Transition.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java index da9ba5a..fd3f9b3 100644 --- a/core/java/android/transition/Transition.java +++ b/core/java/android/transition/Transition.java @@ -552,7 +552,8 @@ public abstract class Transition implements Cloneable { return false; } - private static ArrayMap<Animator, AnimationInfo> getRunningAnimators() { + /** @hide */ + public static ArrayMap<Animator, AnimationInfo> getRunningAnimators() { ArrayMap<Animator, AnimationInfo> runningAnimators = sRunningAnimators.get(); if (runningAnimators == null) { runningAnimators = new ArrayMap<Animator, AnimationInfo>(); @@ -1077,6 +1078,9 @@ public abstract class Transition implements Cloneable { if (view == null) { return; } + if (!isValidTarget(view, view.getId())) { + return; + } boolean isListViewItem = false; if (view.getParent() instanceof ListView) { isListViewItem = true; @@ -1467,6 +1471,10 @@ public abstract class Transition implements Cloneable { mCanRemoveViews = canRemoveViews; } + public boolean canRemoveViews() { + return mCanRemoveViews; + } + @Override public String toString() { return toString(""); @@ -1629,9 +1637,10 @@ public abstract class Transition implements Cloneable { * animation should be canceled or a new animation noop'd. The structure holds * information about the state that an animation is going to, to be compared to * end state of a new animation. + * @hide */ - private static class AnimationInfo { - View view; + public static class AnimationInfo { + public View view; String name; TransitionValues values; |