commit 688d038173a40f68ec2d06183978e4aaddbb9806
author Raph Levien <raph@google.com> Wed Oct 31 16:27:48 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 31 16:27:48 2012 -0700
tree cb893ab3c438c9af2bb4a06d1d8c0ce3c897fcd1
parent 4bce83ee052b21df275822d11b07fb1fdf214cc9
parent c01d1045ef6c79000afc6f07a74ee7963a2092ac

am c01d1045: Merge "Fix for bug 7400445 regression in background drawable" into jb-mr1-dev

* commit 'c01d1045ef6c79000afc6f07a74ee7963a2092ac':
  Fix for bug 7400445 regression in background drawable

graphics/java/android/graphics/drawable/GradientDrawable.java

diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java
index 8374b10..0623a9e 100644
--- a/graphics/java/android/graphics/drawable/GradientDrawable.java
+++ b/graphics/java/android/graphics/drawable/GradientDrawable.java
@@ -1191,6 +1191,11 @@
                 return;
             }
 
+            if (mRadius > 0 || mRadiusArray != null) {
+                mOpaque = false;
+                return;
+            }
+
             if (mStrokeWidth > 0 && !isOpaque(mStrokeColor)) {
                 mOpaque = false;
                 return;