summaryrefslogtreecommitdiff
path: root/libs/hwui/VectorDrawable.cpp
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2016-05-26 15:19:15 -0700
committerDoris Liu <tianliu@google.com>2016-05-27 10:54:55 -0700
commit028029730bf2d177f84316d2d444d409eba4b6cb (patch)
treebb801210f923601dfec6d17c887af835882dc92f /libs/hwui/VectorDrawable.cpp
parent0ca3829d4c36c96099cd1d008036c252daf90b8e (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: I265e7e3cb92455b876cae248bcb9811230cb34f9
Diffstat (limited to 'libs/hwui/VectorDrawable.cpp')
-rw-r--r--libs/hwui/VectorDrawable.cpp2
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;