diff options
author | Romain Guy <romainguy@google.com> | 2011-02-23 11:21:39 -0800 |
---|---|---|
committer | Romain Guy <romainguy@google.com> | 2011-02-23 11:21:39 -0800 |
commit | 39c512b623eff1d7a7b17f68a42723fbda9bf483 (patch) | |
tree | 02cb73cb160bb16f688f3ecc7e44b6b29fc524c1 /graphics/java | |
parent | 16dc3073a2f06a77d9873e536f633a4adf575fce (diff) | |
download | frameworks_base-39c512b623eff1d7a7b17f68a42723fbda9bf483.zip frameworks_base-39c512b623eff1d7a7b17f68a42723fbda9bf483.tar.gz frameworks_base-39c512b623eff1d7a7b17f68a42723fbda9bf483.tar.bz2 |
Don't swap bottom left and bottom right corner radii.
Change-Id: If57b6627f67998edc384de15e3d970f8edf18211
Diffstat (limited to 'graphics/java')
-rw-r--r-- | graphics/java/android/graphics/BitmapFactory.java | 2 | ||||
-rw-r--r-- | graphics/java/android/graphics/drawable/GradientDrawable.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java index cffee5f..8d17561 100644 --- a/graphics/java/android/graphics/BitmapFactory.java +++ b/graphics/java/android/graphics/BitmapFactory.java @@ -240,7 +240,7 @@ public class BitmapFactory { /** * The resulting height of the bitmap, set independent of the state of * inJustDecodeBounds. However, if there is an error trying to decode, - * outHeight will be set to -1. + * outHeight will be set to -1. */ public int outHeight; diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index 65c6ccf..2089751 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -811,11 +811,12 @@ public class GradientDrawable extends Drawable { com.android.internal.R.styleable.DrawableCorners_bottomRightRadius, radius); if (topLeftRadius != radius || topRightRadius != radius || bottomLeftRadius != radius || bottomRightRadius != radius) { + // The corner radii are specified in clockwise order (see Path.addRoundRect()) setCornerRadii(new float[] { topLeftRadius, topLeftRadius, topRightRadius, topRightRadius, - bottomLeftRadius, bottomLeftRadius, - bottomRightRadius, bottomRightRadius + bottomRightRadius, bottomRightRadius, + bottomLeftRadius, bottomLeftRadius }); } a.recycle(); |