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

Merge "Merge "Fix a NPE with outlineProvider="none"" am: 46a4fbb2e4 am: 65d65ec14b am: a3460f2bb1" into oc-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-05-08 21:21:35 +00:00
committed by Android (Google) Code Review
parent 9f62a23796 3d33f5cf77
commit 939ba35913
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/layoutlib/bridge/src/android/view/ViewGroup_Delegate.java
View File

@@ -50,12 +50,14 @@ public class ViewGroup_Delegate {
// the outline obtained is correct.
child.setBackgroundBounds();
ViewOutlineProvider outlineProvider = child.getOutlineProvider();
Outline outline = child.mAttachInfo.mTmpOutline;
outlineProvider.getOutline(child, outline);
if (outline.mPath != null || (outline.mRect != null && !outline.mRect.isEmpty())) {
int restoreTo = transformCanvas(thisVG, canvas, child);
drawShadow(thisVG, canvas, child, outline);
canvas.restoreToCount(restoreTo);
if (outlineProvider != null) {
Outline outline = child.mAttachInfo.mTmpOutline;
outlineProvider.getOutline(child, outline);
if (outline.mPath != null || (outline.mRect != null && !outline.mRect.isEmpty())) {
int restoreTo = transformCanvas(thisVG, canvas, child);
drawShadow(thisVG, canvas, child, outline);
canvas.restoreToCount(restoreTo);
}
}
}
return thisVG.drawChild_Original(canvas, child, drawingTime);