summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-06-24 05:40:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-23 21:44:43 +0000
commita2c96d540659a0312c3cad9a870d90f737b4b8c1 (patch)
treed46bbc2c577efa31811169a1204adfa9128fd622 /tools
parentb0419c8c4f74236351848ed1b502ebaa94b92ae7 (diff)
parentead9ce3ff6c7dd9c0607b3eb6496317f8e58e871 (diff)
downloadframeworks_base-a2c96d540659a0312c3cad9a870d90f737b4b8c1.zip
frameworks_base-a2c96d540659a0312c3cad9a870d90f737b4b8c1.tar.gz
frameworks_base-a2c96d540659a0312c3cad9a870d90f737b4b8c1.tar.bz2
Merge "Temporarily change PorterDuff mode MULTIPLY to SRC_IN" into lmp-preview-dev
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);
}