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

Avoid saveLayer in RippleDrawable if the background won't draw

Browse Source 
BUG: 17952941
Change-Id: Ic2640f847e2ed43fc5117d43230513ee7696d9e7
This commit is contained in:
Alan Viverette
2014-10-13 16:47:57 -07:00
parent 2f82e48abb
commit a7b64e8eef
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/java/android/graphics/drawable/RippleDrawable.java
View File

@@ -719,10 +719,12 @@ public class RippleDrawable extends LayerDrawable {
final ChildDrawable[] array = mLayerState.mChildren;
final int count = mLayerState.mNum;
// We don't need a layer if we don't expect to draw any ripples, we have
// an explicit mask, or if the non-mask content is all opaque.
// We don't need a layer if we don't expect to draw any ripples or
// a background, we have an explicit mask, or if the non-mask content
// is all opaque.
boolean needsLayer = false;
if ((mExitingRipplesCount > 0 || mBackground != null) && mMask == null) {
if ((mExitingRipplesCount > 0 || (mBackground != null && mBackground.shouldDraw()))
&& mMask == null) {
for (int i = 0; i < count; i++) {
if (array[i].mId != R.id.mask
&& array[i].mDrawable.getOpacity() != PixelFormat.OPAQUE) {