summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-12-09 23:47:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-09 23:47:27 +0000
commitf1d6706fb44f0a4caa2a580caae9a48d4da2caa7 (patch)
treece5716d1a8195ef144764361eef72496dfd7ef09 /graphics
parent189c1808574b11b44b0d08b39426313778e27404 (diff)
parentc5d71c67dfbcd0d80ee1fa453e027ea642542fc3 (diff)
downloadframeworks_base-f1d6706fb44f0a4caa2a580caae9a48d4da2caa7.zip
frameworks_base-f1d6706fb44f0a4caa2a580caae9a48d4da2caa7.tar.gz
frameworks_base-f1d6706fb44f0a4caa2a580caae9a48d4da2caa7.tar.bz2
am c5d71c67: am 60abe259: am 6ef76c60: Merge "Fix default value of AnimationDrawable\'s one shot property" into lmp-mr1-dev
* commit 'c5d71c67dfbcd0d80ee1fa453e027ea642542fc3': Fix default value of AnimationDrawable's one shot property
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/drawable/AnimationDrawable.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/AnimationDrawable.java b/graphics/java/android/graphics/drawable/AnimationDrawable.java
index 9eb0251..74ff1b0 100644
--- a/graphics/java/android/graphics/drawable/AnimationDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimationDrawable.java
@@ -375,7 +375,7 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An
mOneShot = orig.mOneShot;
} else {
mDurations = new int[getCapacity()];
- mOneShot = true;
+ mOneShot = false;
}
}