Merge "Don't draw layers in buildLayer()"

Author: mikejurka

core/java/android/view/HardwareLayer.java

@@ -167,7 +167,7 @@ void update(int width, int height, boolean isOpaque) {
 
     /**
      * Specifies the display list to use to refresh the layer.
-     * 
+     *
      * @param displayList The display list containing the drawing commands to
      *                    execute in this layer
      * @param dirtyRect The dirty region of the layer that needs to be redrawn

core/java/android/view/TextureView.java

@@ -315,7 +315,7 @@ protected void destroyHardwareResources() {
     }
 
     @Override
-    HardwareLayer getHardwareLayer(boolean immediateRefresh) {
+    HardwareLayer getHardwareLayer() {
         if (mLayer == null) {
             if (mAttachInfo == null || mAttachInfo.mHardwareRenderer == null) {
                 return null;

core/java/android/view/View.java

@@ -10221,7 +10221,7 @@ public void buildLayer() {
                 if (mAttachInfo.mHardwareRenderer != null &&
                         mAttachInfo.mHardwareRenderer.isEnabled() &&
                         mAttachInfo.mHardwareRenderer.validate()) {
-                    getHardwareLayer(true);
+                    getHardwareLayer();
                 }
                 break;
             case LAYER_TYPE_SOFTWARE:
@@ -10243,7 +10243,7 @@ void flushLayer() {
      *
      * @return A HardwareLayer ready to render, or null if an error occurred.
      */
-    HardwareLayer getHardwareLayer(boolean immediateRefresh) {
+    HardwareLayer getHardwareLayer() {
         if (mAttachInfo == null || mAttachInfo.mHardwareRenderer == null ||
                 !mAttachInfo.mHardwareRenderer.isEnabled()) {
             return null;
@@ -10273,33 +10273,8 @@ HardwareLayer getHardwareLayer(boolean immediateRefresh) {
                 return null;
             }
 
-            if (!immediateRefresh) {
-                mHardwareLayer.redraw(getDisplayList(), mLocalDirtyRect);
-                mLocalDirtyRect.setEmpty();
-            } else {
-                HardwareCanvas currentCanvas = mAttachInfo.mHardwareCanvas;
-                final HardwareCanvas canvas = mHardwareLayer.start(currentCanvas);
-    
-                // Make sure all the GPU resources have been properly allocated
-                if (canvas == null) {
-                    mHardwareLayer.end(currentCanvas);
-                    return null;
-                }
-    
-                mAttachInfo.mHardwareCanvas = canvas;
-                try {
-                    canvas.setViewport(width, height);
-                    canvas.onPreDraw(mLocalDirtyRect);
-                    mLocalDirtyRect.setEmpty();
-                    
-                    canvas.drawDisplayList(getDisplayList(), mRight - mLeft, mBottom - mTop, null,
-                            DisplayList.FLAG_CLIP_CHILDREN);
-                } finally {
-                    canvas.onPostDraw();
-                    mHardwareLayer.end(currentCanvas);
-                    mAttachInfo.mHardwareCanvas = currentCanvas;
-                }
-            }
+            mHardwareLayer.redraw(getDisplayList(), mLocalDirtyRect);
+            mLocalDirtyRect.setEmpty();
         }
 
         return mHardwareLayer;
@@ -11266,7 +11241,7 @@ boolean draw(Canvas canvas, ViewGroup parent, long drawingTime) {
         if (hasNoCache) {
             boolean layerRendered = false;
             if (layerType == LAYER_TYPE_HARDWARE) {
-                final HardwareLayer layer = getHardwareLayer(false);
+                final HardwareLayer layer = getHardwareLayer();
                 if (layer != null && layer.isValid()) {
                     mLayerPaint.setAlpha((int) (alpha * 255));
                     ((HardwareCanvas) canvas).drawHardwareLayer(layer, 0, 0, mLayerPaint);