From bcbec0ccd07d04597992d7ab0dede34288ba31f3 Mon Sep 17 00:00:00 2001
From: Chet Haase <chet@google.com>
Date: Thu, 15 Mar 2012 09:22:17 -0700
Subject: [PATCH] Fix bug with transform Animations

A recent change to enable View properties at the native DisplayList level
mistakenly cuased Animation transforms get be ignored for any View with
a DisplayList. The correct code should have checked whether DL properties
were enabled for the view (disabled by default for now).

Issue #6173975 Animations are gone

Change-Id: I5d5f53f854fb1b533a3150158e84392d7283d2a8
---
 core/java/android/view/View.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index bf48ff2d57eac..d72241f0523fa 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -11473,7 +11473,7 @@ public class View implements Drawable.Callback, Drawable.Callback2, KeyEvent.Cal
                     if (concatMatrix) {
                         // Undo the scroll translation, apply the transformation matrix,
                         // then redo the scroll translate to get the correct result.
-                        if (!hasDisplayList) {
+                        if (!useDisplayListProperties) {
                             canvas.translate(-transX, -transY);
                             canvas.concat(transformToApply.getMatrix());
                             canvas.translate(transX, transY);