Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am addc906f: Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev

Browse Source 
* commit 'addc906f70ba24aa4b649fff7f98d88b96c8d808':
  Force clipping on layers that fail to be allocated
This commit is contained in:
Chris Craik
2013-04-25 21:22:35 -07:00
committed by Android Git Automerger
parent 22e9225ab1 addc906f70
commit 57fc8122ea
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/View.java
View File

@@ -13787,7 +13787,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
if ((flags & ViewGroup.FLAG_CLIP_CHILDREN) == ViewGroup.FLAG_CLIP_CHILDREN &&
!useDisplayListProperties && layerType == LAYER_TYPE_NONE) {
!useDisplayListProperties && cache == null) {
if (offsetForScroll) {
canvas.clipRect(sx, sy, sx + (mRight - mLeft), sy + (mBottom - mTop));
} else {