From 1be46d7920dbdce24f878d6f4889ea8591ab75c6 Mon Sep 17 00:00:00 2001 From: "viral.vkm" Date: Thu, 25 Mar 2010 17:50:57 +0530 Subject: setCornerRadii should be called when either of corners radius is specified as 0dp and thus while checking for condition, it should be ORed and not ANDed. It solves Android Issue: 939 http://code.google.com/p/android/issues/detail?id=939 Change-Id: Ic18fae769480972f763f634e7462c6ed3853220b --- graphics/java/android/graphics/drawable/GradientDrawable.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'graphics/java/android') diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index 91a2bc1..63d1446 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -778,8 +778,8 @@ public class GradientDrawable extends Drawable { com.android.internal.R.styleable.DrawableCorners_bottomLeftRadius, radius); int bottomRightRadius = a.getDimensionPixelSize( com.android.internal.R.styleable.DrawableCorners_bottomRightRadius, radius); - if (topLeftRadius != radius && topRightRadius != radius && - bottomLeftRadius != radius && bottomRightRadius != radius) { + if (topLeftRadius != radius || topRightRadius != radius || + bottomLeftRadius != radius || bottomRightRadius != radius) { setCornerRadii(new float[] { topLeftRadius, topLeftRadius, topRightRadius, topRightRadius, -- cgit v1.1 From 5f3445dc609fb3dd64b023c1ba9c1ee3ba95b868 Mon Sep 17 00:00:00 2001 From: David Hoover Date: Sun, 28 Mar 2010 08:48:55 -0700 Subject: Fix typos in comment. Change-Id: Ia2a9ea0802bcc5773bb4fd52d7e07f9492242bfd --- graphics/java/android/graphics/Color.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'graphics/java/android') diff --git a/graphics/java/android/graphics/Color.java b/graphics/java/android/graphics/Color.java index 5cefaa3..a50693d 100644 --- a/graphics/java/android/graphics/Color.java +++ b/graphics/java/android/graphics/Color.java @@ -30,7 +30,8 @@ import java.util.Locale; * (green << 8) | blue. Each component ranges between 0..255 with 0 * meaning no contribution for that component, and 255 meaning 100% * contribution. Thus opaque-black would be 0xFF000000 (100% opaque but - * no contributes from red, gree, blue, and opaque-white would be 0xFFFFFFFF + * no contributions from red, green, or blue), and opaque-white would be + * 0xFFFFFFFF */ public class Color { public static final int BLACK = 0xFF000000; -- cgit v1.1