summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2012-04-19 09:22:34 -0700
committerChet Haase <chet@google.com>2012-04-19 09:22:34 -0700
commit1fb8a9e44a5d0710d58c883e087469e95be65b5b (patch)
treeb1b5d4fa7219513f6da1fe7fc53efb8296318f18
parentf01d3dd710e8b86b3e2846af62835158fd4e0db1 (diff)
downloadframeworks_base-1fb8a9e44a5d0710d58c883e087469e95be65b5b.zip
frameworks_base-1fb8a9e44a5d0710d58c883e087469e95be65b5b.tar.gz
frameworks_base-1fb8a9e44a5d0710d58c883e087469e95be65b5b.tar.bz2
Fix init of Animation in View drawing code
The refactor of ViewGroup.drawChild() resulted in an error in a new method (View.drawAnimation) where animations were being initialized with their view dimensions instead of the parent dimensions. Issue #6292681 RotateAnimationTest#testRotateAgainstPoint fails on JRN04 Issue #6293275 TranslateAnimationTest#testInitialize fails on JRN04 Change-Id: Ia90711cadd7a6c20fd788e5b8b18a5b28551e68c
-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 2fea8ec..7a0e10e 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();
}