summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chet Haase <chet@google.com> 2012-01-26 15:53:03 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-01-26 15:53:03 -0800
commit23fb7dc7c74ac16273cb22313080eaa9de915225 (patch)
treef383cff7223db8f96cfb5a00115429faf69eb3d8
parentbbbf6b9c49301460a34e749d476c10834a609cf5 (diff)
parent53f2d55740c50507797475a2f7186421c0ada2d1 (diff)
Merge "Fix old issue with compatibility-scaled apps and Animations"
-rw-r--r--core/java/android/view/ViewGroup.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 5c63366f1b40..dda695fcca91 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -2661,8 +2661,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
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();