diff options
author | Chet Haase <chet@google.com> | 2013-10-03 18:02:21 -0700 |
---|---|---|
committer | Chet Haase <chet@google.com> | 2013-10-04 14:05:48 -0700 |
commit | aa006133228facf2f9b61e0492fd8f724fac472f (patch) | |
tree | e2d1a7b3baa52dec9e33bdc04e8cfbf3689ca381 /core/java/android/transition/TransitionManager.java | |
parent | 76a5c86df7902870c87ff07ffd0628cb10f32c00 (diff) | |
download | frameworks_base-aa006133228facf2f9b61e0492fd8f724fac472f.zip frameworks_base-aa006133228facf2f9b61e0492fd8f724fac472f.tar.gz frameworks_base-aa006133228facf2f9b61e0492fd8f724fac472f.tar.bz2 |
Enable transitions in lockscreen media controller
Media controller now fades between different states. The code for
doing this was already there, but this CL enables them and changes
the behavior of transition's OnPreDrawListener to do the right thing.
Also, this CL fixes a bug in ChangeText found while testing this change.
Issue #11083563 ChangeText transition crashes when KEEP transition type used
Change-Id: I5e04c28e1b5faac017b0a4e49734d9faa7fe79cd
Diffstat (limited to 'core/java/android/transition/TransitionManager.java')
-rw-r--r-- | core/java/android/transition/TransitionManager.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/core/java/android/transition/TransitionManager.java b/core/java/android/transition/TransitionManager.java index 9be91d0..404709c 100644 --- a/core/java/android/transition/TransitionManager.java +++ b/core/java/android/transition/TransitionManager.java @@ -240,12 +240,7 @@ public class TransitionManager { } transition.playTransition(sceneRoot); - // Returning false from onPreDraw() skips the current frame. This is - // necessary to avoid artifacts caused by resetting target views - // to their proper end states for capturing. Waiting until the next - // frame to draw allows these views to have their mid-transition - // values set on them again and avoid artifacts. - return false; + return true; } }; observer.addOnPreDrawListener(listener); |