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

Merge "Dont ignore layer paint alpha in software path" into mnc-dev

Browse Source
This commit is contained in:
Chris Craik
2015-06-09 22:23:34 +00:00
committed by Android (Google) Code Review
parent bcdf0dc199 f396f011ee
commit 751afe2040
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16070,23 +16070,23 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
} else if (cache != null) {
mPrivateFlags &= ~PFLAG_DIRTY_MASK;
Paint cachePaint;
int restoreAlpha = 0;
if (layerType == LAYER_TYPE_NONE) {
cachePaint = parent.mCachePaint;
// no layer paint, use temporary paint to draw bitmap
Paint cachePaint = parent.mCachePaint;
if (cachePaint == null) {
cachePaint = new Paint();
cachePaint.setDither(false);
parent.mCachePaint = cachePaint;
}
cachePaint.setAlpha((int) (alpha * 255));
canvas.drawBitmap(cache, 0.0f, 0.0f, cachePaint);
} else {
cachePaint = mLayerPaint;
restoreAlpha = mLayerPaint.getAlpha();
// use layer paint to draw the bitmap, merging the two alphas, but also restore
int layerPaintAlpha = mLayerPaint.getAlpha();
mLayerPaint.setAlpha((int) (alpha * layerPaintAlpha));
canvas.drawBitmap(cache, 0.0f, 0.0f, mLayerPaint);
mLayerPaint.setAlpha(layerPaintAlpha);
}
cachePaint.setAlpha((int) (alpha * 255));
canvas.drawBitmap(cache, 0.0f, 0.0f, cachePaint);
cachePaint.setAlpha(restoreAlpha);
}
if (restoreTo >= 0) {