commit ba64974141bb04d35759c7a8f1741d23c172f9a5
author Michael Jurka <mikejurka@google.com> Thu Jun 28 19:12:58 2012 -0700
committer Michael Jurka <mikejurka@google.com> Thu Jun 28 19:15:20 2012 -0700
tree 525f25da1cd84b32201ef32587bf971fc97f8b4e
parent 041c36686dd986834990d85f7f93fe2ee4e5fca5

Removing setChildrenLayersEnabled

Change-Id: I88d8228eadb59160648f2c4e131fcd85945f2109

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index a6a5427..b6f0aa2 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -12363,9 +12363,7 @@
                 canvas.setViewport(width, height);
                 // The dirty rect should always be null for a display list
                 canvas.onPreDraw(null);
-                int layerType = (
-                        !(mParent instanceof ViewGroup) || ((ViewGroup)mParent).mDrawLayers) ?
-                        getLayerType() : LAYER_TYPE_NONE;
+                int layerType = getLayerType();
                 if (!isLayer && layerType != LAYER_TYPE_NONE) {
                     if (layerType == LAYER_TYPE_HARDWARE) {
                         final HardwareLayer layer = getHardwareLayer();
@@ -13072,7 +13070,7 @@
 
         boolean scalingRequired = false;
         boolean caching;
-        int layerType = parent.mDrawLayers ? getLayerType() : LAYER_TYPE_NONE;
+        int layerType = getLayerType();
 
         final boolean hardwareAccelerated = canvas.isHardwareAccelerated();
         if ((flags & ViewGroup.FLAG_CHILDREN_DRAWN_WITH_CACHE) != 0 ||