diff options
| author | Romain Guy <romainguy@google.com> | 2012-10-23 15:46:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-23 15:46:59 -0700 |
| commit | be815669d1c41a95f79222aaa7caa4462bddfb2d (patch) | |
| tree | bb7010f3bdb7e30441bb679406be0ea7b0f21ef6 /core/java/android/view/ViewRootImpl.java | |
| parent | fec93f67190f7ced8578130e2340dee0e4010a33 (diff) | |
| parent | 9389d447c175b4ef9fb85cd296f53cf24be4fd7d (diff) | |
| download | frameworks_base-be815669d1c41a95f79222aaa7caa4462bddfb2d.zip frameworks_base-be815669d1c41a95f79222aaa7caa4462bddfb2d.tar.gz frameworks_base-be815669d1c41a95f79222aaa7caa4462bddfb2d.tar.bz2 | |
am 9389d447: am b75ade9c: Merge "Use existing display list to render the resize buffer Bug #7400903" into jb-mr1-dev
* commit '9389d447c175b4ef9fb85cd296f53cf24be4fd7d':
Use existing display list to render the resize buffer Bug #7400903
Diffstat (limited to 'core/java/android/view/ViewRootImpl.java')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 10 |
1 files changed, 7 insertions, 3 deletions
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.CompatibilityInfo; 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 @@ public final class ViewRootImpl implements ViewParent, 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); |