diff options
author | Doris Liu <tianliu@google.com> | 2016-05-26 15:19:15 -0700 |
---|---|---|
committer | Doris Liu <tianliu@google.com> | 2016-05-26 16:06:58 -0700 |
commit | 335d7d174464ea3fc2d058dcff6e436df1cf0fd9 (patch) | |
tree | 7fff98258ae55ed73221533525fe27beee6a914d /libs/hwui/VectorDrawable.cpp | |
parent | 67ce99b66ebc816ae8bbc222db8f3695fb15495b (diff) |
Copy native tree's property when mutate vector drawable
When mutating vector drawables, we need to not only copy over
the VD tree structure, but also the properties of the VD tree,
such as alpha.
Bug: 28974071
Change-Id: If793f5f2b6e116472a1c6da0fb60d8278a78b03f
Diffstat (limited to 'libs/hwui/VectorDrawable.cpp')
-rw-r--r-- | libs/hwui/VectorDrawable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/VectorDrawable.cpp b/libs/hwui/VectorDrawable.cpp index f0348e4977ae..2b7994139641 100644 --- a/libs/hwui/VectorDrawable.cpp +++ b/libs/hwui/VectorDrawable.cpp @@ -530,7 +530,7 @@ SkPaint* Tree::updatePaint(SkPaint* outPaint, TreeProperties* prop) { if (prop->getRootAlpha() == 1.0f && prop->getColorFilter() == nullptr) { return nullptr; } else { - outPaint->setColorFilter(mStagingProperties.getColorFilter()); + outPaint->setColorFilter(prop->getColorFilter()); outPaint->setFilterQuality(kLow_SkFilterQuality); outPaint->setAlpha(prop->getRootAlpha() * 255); return outPaint; |