diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-03-25 16:39:32 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-03-25 16:39:32 -0700 |
| commit | 8e10a7b7c82209bf52ab8545d21777ea1728f81e (patch) | |
| tree | 0a1cc5fd950d41541a2d949210f183fe78d91514 /graphics | |
| parent | 53d7c234432c8d2cca5b6e2ac08ab859b062f892 (diff) | |
| parent | 1be46d7920dbdce24f878d6f4889ea8591ab75c6 (diff) | |
| download | frameworks_base-8e10a7b7c82209bf52ab8545d21777ea1728f81e.zip frameworks_base-8e10a7b7c82209bf52ab8545d21777ea1728f81e.tar.gz frameworks_base-8e10a7b7c82209bf52ab8545d21777ea1728f81e.tar.bz2 | |
merge from open-source master
Change-Id: I4d8f34986fd9e16ead8a22909263069dbb819d3e
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/GradientDrawable.java | 4 |
1 files changed, 2 insertions, 2 deletions
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, |