diff options
| author | George Mount <mount@google.com> | 2014-08-18 16:24:21 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2014-08-19 16:43:06 +0000 |
| commit | 7f15164ecb4c93cbb3cc886a3028621c0d0fffcc (patch) | |
| tree | ea32b563187d994305d63493d124706aaacad6a2 /policy | |
| parent | fc12e6f1da309a889e529adabf5082ba52ed1db4 (diff) | |
| download | frameworks_base-7f15164ecb4c93cbb3cc886a3028621c0d0fffcc.zip frameworks_base-7f15164ecb4c93cbb3cc886a3028621c0d0fffcc.tar.gz frameworks_base-7f15164ecb4c93cbb3cc886a3028621c0d0fffcc.tar.bz2 | |
Add a way to get Transitions from a TransitionSet.
Bug 17113732
Change-Id: I0a157a59448e66560ba2252709971131c5dea401
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 964acbd..73358c8 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -3559,6 +3559,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { if (transitionId != -1 && transitionId != R.transition.no_transition) { TransitionInflater inflater = TransitionInflater.from(getContext()); transition = inflater.inflateTransition(transitionId); + if (transition instanceof TransitionSet && + ((TransitionSet)transition).getTransitionCount() == 0) { + transition = null; + } } return transition; } |