From 55e49d8816d7a6fad20df604839a4d2bfe6b9957 Mon Sep 17 00:00:00 2001 From: Nader Jawad Date: Fri, 16 Nov 2018 11:22:32 -0800 Subject: Added support for additional Blend Modes Created new BlendMode enum that maps to XferModes with additional supported native values that map to SkBlendMode constants Created new BlendModeColorFilter Deprecated PorterDuffColorMode and PorterDuffColorFilter in favor of BlendMode and BlendModeColorFilter. Updated Paint API to use setBlendMode and deprecated setXfermode Bug: 119671925 Bug: 112166079 Bug: 73224934 Test: Added CTS tests for BlendMode and BlendModeColorFilter Change-Id: Idd50e2f0b81975c5ecf6f1c0edd4eb68198d9131 --- docs/html/reference/images/graphics/blendmode_CLEAR.png | Bin 0 -> 363 bytes docs/html/reference/images/graphics/blendmode_COLOR.png | Bin 0 -> 3836 bytes .../reference/images/graphics/blendmode_COLOR_BURN.png | Bin 0 -> 4092 bytes .../reference/images/graphics/blendmode_COLOR_DODGE.png | Bin 0 -> 3980 bytes docs/html/reference/images/graphics/blendmode_DARKEN.png | Bin 0 -> 3894 bytes .../reference/images/graphics/blendmode_DIFFERENCE.png | Bin 0 -> 4055 bytes docs/html/reference/images/graphics/blendmode_DST.png | Bin 0 -> 3656 bytes .../reference/images/graphics/blendmode_DST_ATOP.png | Bin 0 -> 1717 bytes docs/html/reference/images/graphics/blendmode_DST_IN.png | Bin 0 -> 1423 bytes .../html/reference/images/graphics/blendmode_DST_OUT.png | Bin 0 -> 2983 bytes .../reference/images/graphics/blendmode_DST_OVER.png | Bin 0 -> 3982 bytes .../reference/images/graphics/blendmode_EXCLUSION.png | Bin 0 -> 4002 bytes .../reference/images/graphics/blendmode_HARD_LIGHT.png | Bin 0 -> 3857 bytes docs/html/reference/images/graphics/blendmode_HUE.png | Bin 0 -> 3926 bytes .../html/reference/images/graphics/blendmode_LIGHTEN.png | Bin 0 -> 3749 bytes .../reference/images/graphics/blendmode_LUMINOSITY.png | Bin 0 -> 4052 bytes .../reference/images/graphics/blendmode_MODULATE.png | Bin 0 -> 1435 bytes .../reference/images/graphics/blendmode_MULTIPLY.png | Bin 0 -> 3949 bytes .../html/reference/images/graphics/blendmode_OVERLAY.png | Bin 0 -> 4011 bytes docs/html/reference/images/graphics/blendmode_PLUS.png | Bin 0 -> 3898 bytes .../reference/images/graphics/blendmode_SATURATION.png | Bin 0 -> 4015 bytes docs/html/reference/images/graphics/blendmode_SCREEN.png | Bin 0 -> 3857 bytes .../reference/images/graphics/blendmode_SOFT_LIGHT.png | Bin 0 -> 4031 bytes docs/html/reference/images/graphics/blendmode_SRC.png | Bin 0 -> 690 bytes .../reference/images/graphics/blendmode_SRC_ATOP.png | Bin 0 -> 3762 bytes docs/html/reference/images/graphics/blendmode_SRC_IN.png | Bin 0 -> 1415 bytes .../html/reference/images/graphics/blendmode_SRC_OUT.png | Bin 0 -> 1591 bytes .../reference/images/graphics/blendmode_SRC_OVER.png | Bin 0 -> 3188 bytes docs/html/reference/images/graphics/blendmode_XOR.png | Bin 0 -> 3971 bytes 29 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/html/reference/images/graphics/blendmode_CLEAR.png create mode 100644 docs/html/reference/images/graphics/blendmode_COLOR.png create mode 100644 docs/html/reference/images/graphics/blendmode_COLOR_BURN.png create mode 100644 docs/html/reference/images/graphics/blendmode_COLOR_DODGE.png create mode 100644 docs/html/reference/images/graphics/blendmode_DARKEN.png create mode 100644 docs/html/reference/images/graphics/blendmode_DIFFERENCE.png create mode 100644 docs/html/reference/images/graphics/blendmode_DST.png create mode 100644 docs/html/reference/images/graphics/blendmode_DST_ATOP.png create mode 100644 docs/html/reference/images/graphics/blendmode_DST_IN.png create mode 100644 docs/html/reference/images/graphics/blendmode_DST_OUT.png create mode 100644 docs/html/reference/images/graphics/blendmode_DST_OVER.png create mode 100644 docs/html/reference/images/graphics/blendmode_EXCLUSION.png create mode 100644 docs/html/reference/images/graphics/blendmode_HARD_LIGHT.png create mode 100644 docs/html/reference/images/graphics/blendmode_HUE.png create mode 100644 docs/html/reference/images/graphics/blendmode_LIGHTEN.png create mode 100644 docs/html/reference/images/graphics/blendmode_LUMINOSITY.png create mode 100644 docs/html/reference/images/graphics/blendmode_MODULATE.png create mode 100644 docs/html/reference/images/graphics/blendmode_MULTIPLY.png create mode 100644 docs/html/reference/images/graphics/blendmode_OVERLAY.png create mode 100644 docs/html/reference/images/graphics/blendmode_PLUS.png create mode 100644 docs/html/reference/images/graphics/blendmode_SATURATION.png create mode 100644 docs/html/reference/images/graphics/blendmode_SCREEN.png create mode 100644 docs/html/reference/images/graphics/blendmode_SOFT_LIGHT.png create mode 100644 docs/html/reference/images/graphics/blendmode_SRC.png create mode 100644 docs/html/reference/images/graphics/blendmode_SRC_ATOP.png create mode 100644 docs/html/reference/images/graphics/blendmode_SRC_IN.png create mode 100644 docs/html/reference/images/graphics/blendmode_SRC_OUT.png create mode 100644 docs/html/reference/images/graphics/blendmode_SRC_OVER.png create mode 100644 docs/html/reference/images/graphics/blendmode_XOR.png (limited to 'docs') diff --git a/docs/html/reference/images/graphics/blendmode_CLEAR.png b/docs/html/reference/images/graphics/blendmode_CLEAR.png new file mode 100644 index 000000000000..979782adef58 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_CLEAR.png differ diff --git a/docs/html/reference/images/graphics/blendmode_COLOR.png b/docs/html/reference/images/graphics/blendmode_COLOR.png new file mode 100644 index 000000000000..2f41bfb03cfb Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_COLOR.png differ diff --git a/docs/html/reference/images/graphics/blendmode_COLOR_BURN.png b/docs/html/reference/images/graphics/blendmode_COLOR_BURN.png new file mode 100644 index 000000000000..26059ce858ee Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_COLOR_BURN.png differ diff --git a/docs/html/reference/images/graphics/blendmode_COLOR_DODGE.png b/docs/html/reference/images/graphics/blendmode_COLOR_DODGE.png new file mode 100644 index 000000000000..922f1d9e474d Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_COLOR_DODGE.png differ diff --git a/docs/html/reference/images/graphics/blendmode_DARKEN.png b/docs/html/reference/images/graphics/blendmode_DARKEN.png new file mode 100644 index 000000000000..6c04aa3a129f Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_DARKEN.png differ diff --git a/docs/html/reference/images/graphics/blendmode_DIFFERENCE.png b/docs/html/reference/images/graphics/blendmode_DIFFERENCE.png new file mode 100644 index 000000000000..aab2bcb8833a Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_DIFFERENCE.png differ diff --git a/docs/html/reference/images/graphics/blendmode_DST.png b/docs/html/reference/images/graphics/blendmode_DST.png new file mode 100644 index 000000000000..16f96b4752b8 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_DST.png differ diff --git a/docs/html/reference/images/graphics/blendmode_DST_ATOP.png b/docs/html/reference/images/graphics/blendmode_DST_ATOP.png new file mode 100644 index 000000000000..d0ae2cde7b0f Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_DST_ATOP.png differ diff --git a/docs/html/reference/images/graphics/blendmode_DST_IN.png b/docs/html/reference/images/graphics/blendmode_DST_IN.png new file mode 100644 index 000000000000..9befe279af73 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_DST_IN.png differ diff --git a/docs/html/reference/images/graphics/blendmode_DST_OUT.png b/docs/html/reference/images/graphics/blendmode_DST_OUT.png new file mode 100644 index 000000000000..e9227e9f06d3 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_DST_OUT.png differ diff --git a/docs/html/reference/images/graphics/blendmode_DST_OVER.png b/docs/html/reference/images/graphics/blendmode_DST_OVER.png new file mode 100644 index 000000000000..015be0a4a730 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_DST_OVER.png differ diff --git a/docs/html/reference/images/graphics/blendmode_EXCLUSION.png b/docs/html/reference/images/graphics/blendmode_EXCLUSION.png new file mode 100644 index 000000000000..307dec90ec33 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_EXCLUSION.png differ diff --git a/docs/html/reference/images/graphics/blendmode_HARD_LIGHT.png b/docs/html/reference/images/graphics/blendmode_HARD_LIGHT.png new file mode 100644 index 000000000000..3b62b9855bf4 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_HARD_LIGHT.png differ diff --git a/docs/html/reference/images/graphics/blendmode_HUE.png b/docs/html/reference/images/graphics/blendmode_HUE.png new file mode 100644 index 000000000000..012bd3332358 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_HUE.png differ diff --git a/docs/html/reference/images/graphics/blendmode_LIGHTEN.png b/docs/html/reference/images/graphics/blendmode_LIGHTEN.png new file mode 100644 index 000000000000..1c3be656e40a Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_LIGHTEN.png differ diff --git a/docs/html/reference/images/graphics/blendmode_LUMINOSITY.png b/docs/html/reference/images/graphics/blendmode_LUMINOSITY.png new file mode 100644 index 000000000000..3549082e4c62 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_LUMINOSITY.png differ diff --git a/docs/html/reference/images/graphics/blendmode_MODULATE.png b/docs/html/reference/images/graphics/blendmode_MODULATE.png new file mode 100644 index 000000000000..ed1b59d140e8 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_MODULATE.png differ diff --git a/docs/html/reference/images/graphics/blendmode_MULTIPLY.png b/docs/html/reference/images/graphics/blendmode_MULTIPLY.png new file mode 100644 index 000000000000..c8c7ccb1e21a Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_MULTIPLY.png differ diff --git a/docs/html/reference/images/graphics/blendmode_OVERLAY.png b/docs/html/reference/images/graphics/blendmode_OVERLAY.png new file mode 100644 index 000000000000..6962f928dc7e Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_OVERLAY.png differ diff --git a/docs/html/reference/images/graphics/blendmode_PLUS.png b/docs/html/reference/images/graphics/blendmode_PLUS.png new file mode 100644 index 000000000000..015fa2b5d0e4 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_PLUS.png differ diff --git a/docs/html/reference/images/graphics/blendmode_SATURATION.png b/docs/html/reference/images/graphics/blendmode_SATURATION.png new file mode 100644 index 000000000000..5ac96c32f648 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_SATURATION.png differ diff --git a/docs/html/reference/images/graphics/blendmode_SCREEN.png b/docs/html/reference/images/graphics/blendmode_SCREEN.png new file mode 100644 index 000000000000..d2d70d25850d Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_SCREEN.png differ diff --git a/docs/html/reference/images/graphics/blendmode_SOFT_LIGHT.png b/docs/html/reference/images/graphics/blendmode_SOFT_LIGHT.png new file mode 100644 index 000000000000..89fbacd24dcc Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_SOFT_LIGHT.png differ diff --git a/docs/html/reference/images/graphics/blendmode_SRC.png b/docs/html/reference/images/graphics/blendmode_SRC.png new file mode 100644 index 000000000000..990ec94301b3 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_SRC.png differ diff --git a/docs/html/reference/images/graphics/blendmode_SRC_ATOP.png b/docs/html/reference/images/graphics/blendmode_SRC_ATOP.png new file mode 100644 index 000000000000..d574dfd923f2 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_SRC_ATOP.png differ diff --git a/docs/html/reference/images/graphics/blendmode_SRC_IN.png b/docs/html/reference/images/graphics/blendmode_SRC_IN.png new file mode 100644 index 000000000000..dda45d7319a4 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_SRC_IN.png differ diff --git a/docs/html/reference/images/graphics/blendmode_SRC_OUT.png b/docs/html/reference/images/graphics/blendmode_SRC_OUT.png new file mode 100644 index 000000000000..f5d43c103dc2 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_SRC_OUT.png differ diff --git a/docs/html/reference/images/graphics/blendmode_SRC_OVER.png b/docs/html/reference/images/graphics/blendmode_SRC_OVER.png new file mode 100644 index 000000000000..b1a405bc878d Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_SRC_OVER.png differ diff --git a/docs/html/reference/images/graphics/blendmode_XOR.png b/docs/html/reference/images/graphics/blendmode_XOR.png new file mode 100644 index 000000000000..31c110d98d27 Binary files /dev/null and b/docs/html/reference/images/graphics/blendmode_XOR.png differ -- cgit v1.2.3