diff options
| author | Chris Craik <ccraik@google.com> | 2015-04-29 19:32:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-29 19:32:42 +0000 |
| commit | 737f0b22bec07297eea782ea2cb29b056e849efc (patch) | |
| tree | 91892f0aa0c0b0d47d5995dafb95b9ffe34baed7 | |
| parent | bdf9ffdd834f5cd021f79c33ce82a16b461f454f (diff) | |
| parent | 7201bf2b7ebac4ed0be6efd6b046f93a8de5b2d0 (diff) | |
| download | frameworks_base-737f0b22bec07297eea782ea2cb29b056e849efc.zip frameworks_base-737f0b22bec07297eea782ea2cb29b056e849efc.tar.gz frameworks_base-737f0b22bec07297eea782ea2cb29b056e849efc.tar.bz2 | |
am 7201bf2b: Merge "Unify View alpha implies clipping behavior" into mnc-dev
* commit '7201bf2b7ebac4ed0be6efd6b046f93a8de5b2d0':
Unify View alpha implies clipping behavior
| -rw-r--r-- | core/java/android/view/View.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index e8fc15e..b5b7f0f 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -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 |