diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-03-30 11:13:47 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-03-30 11:13:47 -0700 |
| commit | b7248b7b810ed501d0a07ce762aee597f3b1c1a2 (patch) | |
| tree | 8385618329b1f6180301082d6b7f091461a71e19 /graphics/java | |
| parent | 98d2e4fcec7869ff264bec821a374fd494a223d6 (diff) | |
| parent | 26fe7d27ee69148905496ebb2fd6347bc51f7b87 (diff) | |
| download | frameworks_base-b7248b7b810ed501d0a07ce762aee597f3b1c1a2.zip frameworks_base-b7248b7b810ed501d0a07ce762aee597f3b1c1a2.tar.gz frameworks_base-b7248b7b810ed501d0a07ce762aee597f3b1c1a2.tar.bz2 | |
merge from open-source master
Change-Id: Iad50c5ab4915d0868b3f79ea6ba0d657a6f98525
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/graphics/Color.java | 3 | ||||
| -rw-r--r-- | graphics/java/android/graphics/drawable/GradientDrawable.java | 4 |
2 files changed, 4 insertions, 3 deletions
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; 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, |