summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-06-24 10:33:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-24 10:33:55 +0000
commit091208709ab2dffa2ab7b22ee17dbb42e1d725e6 (patch)
tree9755e5d31c646e66deb100c898744bd24926a568 /tools
parentd8ef316f1f42ea8e5417ea82bd4e432442cc8c97 (diff)
parenta2c96d540659a0312c3cad9a870d90f737b4b8c1 (diff)
downloadframeworks_base-091208709ab2dffa2ab7b22ee17dbb42e1d725e6.zip
frameworks_base-091208709ab2dffa2ab7b22ee17dbb42e1d725e6.tar.gz
frameworks_base-091208709ab2dffa2ab7b22ee17dbb42e1d725e6.tar.bz2
am 699f7221: Merge "Temporarily change PorterDuff mode MULTIPLY to SRC_IN" into lmp-preview-dev
* commit '699f7221dc0719b1ceb03a03183dc742a5bcdf3c': Temporarily change PorterDuff mode MULTIPLY to SRC_IN
Diffstat (limited to 'tools')
-rw-r--r--tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java
index 0543f4f..c44e03b 100644
--- a/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java
@@ -98,6 +98,11 @@ public class PorterDuffColorFilter_Delegate extends ColorFilter_Delegate {
private PorterDuffColorFilter_Delegate(int srcColor, int mode) {
mSrcColor = srcColor;
+ // Temporarily change multiply to SRC_IN to render menus.
+ // TODO: support Mode.MULTIPLY
+ if (mode == Mode.MULTIPLY.nativeInt) {
+ mode = Mode.SRC_IN.nativeInt;
+ }
mMode = getPorterDuffMode(mode);
}