summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-12-09 17:59:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-09 17:59:08 +0000
commit6ef76c60df9e68950721f92a14c77a3ecd13607c (patch)
tree7856e45f1fed6ac5fa261b8c3db5cfb2441e7c72 /graphics
parent15b29ac7faf3b8b7845e6623f68ae7a7391dab78 (diff)
parent0b9ab9749aec297aa03c3fde6d5552c9f212ddbf (diff)
downloadframeworks_base-6ef76c60df9e68950721f92a14c77a3ecd13607c.zip
frameworks_base-6ef76c60df9e68950721f92a14c77a3ecd13607c.tar.gz
frameworks_base-6ef76c60df9e68950721f92a14c77a3ecd13607c.tar.bz2
Merge "Fix default value of AnimationDrawable's one shot property" into lmp-mr1-dev
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;
}
}