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

am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev

Browse Source 
* commit '7201bf2b7ebac4ed0be6efd6b046f93a8de5b2d0':
  Unify View alpha implies clipping behavior
This commit is contained in:
Chris Craik
2015-04-29 19:32:42 +00:00
committed by Android Git Automerger
parent bdf9ffdd83 7201bf2b7e
commit 737f0b22be
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15490,12 +15490,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
if (drawingWithRenderNode) {
renderNode.setAlpha(alpha * getAlpha() * getTransitionAlpha());
} else if (layerType == LAYER_TYPE_NONE) {
int layerFlags = Canvas.HAS_ALPHA_LAYER_SAVE_FLAG;
if ((parentFlags & ViewGroup.FLAG_CLIP_CHILDREN) != 0) {
layerFlags |= Canvas.CLIP_TO_LAYER_SAVE_FLAG;
}
canvas.saveLayerAlpha(sx, sy, sx + getWidth(), sy + getHeight(),
multipliedAlpha, layerFlags);
multipliedAlpha);
}
} else {
// Alpha is handled by the child directly, clobber the layer's alpha