Merge "Fix crash when shadowSize is 0"

2015-03-05 10:13:00 +00:00
parent be93f28d5b e81096458f
commit d5e11f6f47
1 changed files with 3 additions and 0 deletions
--- a/tools/layoutlib/bridge/src/android/view/ShadowPainter.java
+++ b/tools/layoutlib/bridge/src/android/view/ShadowPainter.java
@@ -65,6 +65,9 @@ public class ShadowPainter {
    @SuppressWarnings({"SuspiciousNameCombination", "UnnecessaryLocalVariable"})  // Imported code
    public static BufferedImage createDropShadow(BufferedImage source, int shadowSize,
            float shadowOpacity, int shadowRgb) {
+        if (shadowSize == 0) {
+            return source;
+        }

        // This code is based on
        //      http://www.jroller.com/gfx/entry/non_rectangular_shadow