commit 9389d447c175b4ef9fb85cd296f53cf24be4fd7d
author Romain Guy <romainguy@google.com> Tue Oct 23 15:44:26 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 23 15:44:26 2012 -0700
tree 2c7723fd000473339e809a4cf945cf37372aa066
parent 39c68da57b443c869378263b8063da6e821a1b6d
parent b75ade9cce02dffb967ff4719381254585074c58

am b75ade9c: Merge "Use existing display list to render the resize buffer Bug #7400903" into jb-mr1-dev

* commit 'b75ade9cce02dffb967ff4719381254585074c58':
  Use existing display list to render the resize buffer Bug #7400903

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 83d913a..73b84ce 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -29,14 +29,12 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Canvas;
-import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;
-import android.graphics.RectF;
 import android.graphics.Region;
 import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
@@ -1442,7 +1440,13 @@
                                 mTranslator.translateCanvas(layerCanvas);
                             }
 
-                            mView.draw(layerCanvas);
+                            DisplayList displayList = mView.mDisplayList;
+                            if (displayList != null) {
+                                layerCanvas.drawDisplayList(displayList, null,
+                                        DisplayList.FLAG_CLIP_CHILDREN);
+                            } else {
+                                mView.draw(layerCanvas);
+                            }
 
                             drawAccessibilityFocusedDrawableIfNeeded(layerCanvas);