diff options
| author | John Reck <jreck@google.com> | 2014-09-05 15:57:47 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-09-05 15:58:26 -0700 |
| commit | f5945a0c8bb868f978d9d0d22043a8b44464a86e (patch) | |
| tree | 225f4979dc6b8e0290307194fa1ec0c3a48ddcff /core/java/android/animation | |
| parent | c237555c6cb89c347acf13eba45b875946473501 (diff) | |
| download | frameworks_base-f5945a0c8bb868f978d9d0d22043a8b44464a86e.zip frameworks_base-f5945a0c8bb868f978d9d0d22043a8b44464a86e.tar.gz frameworks_base-f5945a0c8bb868f978d9d0d22043a8b44464a86e.tar.bz2 | |
Disable RT-anim for AnimatorSet
Bug: 17317184
Unfortunately this will disable *all* RT animations in a scene,
but we don't have more selective targetting currently
Change-Id: I57e1c0ae43957f45229473bdcdaf34c05825fab7
Diffstat (limited to 'core/java/android/animation')
| -rw-r--r-- | core/java/android/animation/AnimatorSet.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java index 9156eeb..7c13dbe 100644 --- a/core/java/android/animation/AnimatorSet.java +++ b/core/java/android/animation/AnimatorSet.java @@ -504,6 +504,10 @@ public final class AnimatorSet extends Animator { mStarted = true; mPaused = false; + for (Node node : mNodes) { + node.animation.setAllowRunningAsynchronously(false); + } + if (mDuration >= 0) { // If the duration was set on this AnimatorSet, pass it along to all child animations for (Node node : mNodes) { |