diff options
| author | 2018-10-03 19:28:20 +0000 | |
|---|---|---|
| committer | 2018-10-03 19:28:20 +0000 | |
| commit | 1d3ebe257c0475c88ff1702e5680cfd7b847ecfd (patch) | |
| tree | 69761324407ceb2aa3f67649d9cd2184c5f74c8f | |
| parent | 79be3b16fcf3d81d8f655bd3a5ff54ff931ee1bc (diff) | |
| parent | 7cc6ec2cf5ef578cc5dd7874108b9602123da32a (diff) | |
Merge "Fix regressed alpha change in VD"
| -rw-r--r-- | libs/hwui/VectorDrawable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/VectorDrawable.cpp b/libs/hwui/VectorDrawable.cpp index dbbe9f3acf53..6cf04bf5f811 100644 --- a/libs/hwui/VectorDrawable.cpp +++ b/libs/hwui/VectorDrawable.cpp @@ -470,10 +470,10 @@ void Tree::drawStaging(Canvas* outCanvas) { void Tree::getPaintFor(SkPaint* outPaint, const TreeProperties &prop) const { // HWUI always draws VD with bilinear filtering. outPaint->setFilterQuality(kLow_SkFilterQuality); - if (prop.getRootAlpha() < 1.0f || prop.getColorFilter() != nullptr) { + if (prop.getColorFilter() != nullptr) { outPaint->setColorFilter(sk_ref_sp(prop.getColorFilter())); - outPaint->setAlpha(prop.getRootAlpha() * 255); } + outPaint->setAlpha(prop.getRootAlpha() * 255); } Bitmap& Tree::getBitmapUpdateIfDirty() { |