Merge "Fix old issue with compatibility-scaled apps and Animations"

chethaase · Android (Google) Code Review · commit 23fb7dc7c74a · 2012-01-26T15:53:03.000-08:00
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
@@ -2661,8 +2661,7 @@ protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
                 child.onAnimationStart();
             }
 
-            more = a.getTransformation(drawingTime, mChildTransformation,
-                    scalingRequired ? mAttachInfo.mApplicationScale : 1f);
+            more = a.getTransformation(drawingTime, mChildTransformation, 1f);
             if (scalingRequired && mAttachInfo.mApplicationScale != 1f) {
                 if (mInvalidationTransformation == null) {
                     mInvalidationTransformation = new Transformation();

Original file line number	Diff line number	Diff line change
`@@ -2661,8 +2661,7 @@ protected boolean drawChild(Canvas canvas, View child, long drawingTime) {`
`2661`	`2661`	`child.onAnimationStart();`
`2662`	`2662`	`}`
`2663`	`2663`
`2664`		`- more = a.getTransformation(drawingTime, mChildTransformation,`
`2665`		`- scalingRequired ? mAttachInfo.mApplicationScale : 1f);`
	`2664`	`+ more = a.getTransformation(drawingTime, mChildTransformation, 1f);`
`2666`	`2665`	`if (scalingRequired && mAttachInfo.mApplicationScale != 1f) {`
`2667`	`2666`	`if (mInvalidationTransformation == null) {`
`2668`	`2667`	`mInvalidationTransformation = new Transformation();`