summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2012-04-19 09:36:49 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-19 09:36:49 -0700
commitf37d87b35b9bc860487104b1870f74caa3ae2e71 (patch)
tree0eca5d0e71f1ff140a9a541e9cf929465d0d2e06
parent9687433dc679a79bbda29199a074d2439737f45f (diff)
parent1fb8a9e44a5d0710d58c883e087469e95be65b5b (diff)
downloadframeworks_base-f37d87b35b9bc860487104b1870f74caa3ae2e71.zip
frameworks_base-f37d87b35b9bc860487104b1870f74caa3ae2e71.tar.gz
frameworks_base-f37d87b35b9bc860487104b1870f74caa3ae2e71.tar.bz2
Merge "Fix init of Animation in View drawing code"
-rw-r--r--core/java/android/view/View.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index bd054bc..7e5fe63 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -12297,7 +12297,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
final int flags = parent.mGroupFlags;
final boolean initialized = a.isInitialized();
if (!initialized) {
- a.initialize(mRight - mLeft, mBottom - mTop, getWidth(), getHeight());
+ a.initialize(mRight - mLeft, mBottom - mTop, parent.getWidth(), parent.getHeight());
a.initializeInvalidateRegion(0, 0, mRight - mLeft, mBottom - mTop);
onAnimationStart();
}