Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ed89e452: am 7c133e19: Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev

Browse Source 
* commit 'ed89e45253ffded993ed88cd33457f45dbd6a32b':
  Fix gradient drawable radius when specified as float, dimension
This commit is contained in:
Alan Viverette
2014-10-21 18:39:06 +00:00
committed by Android Git Automerger
parent 31171de1d9 ed89e45253
commit ef2fef1719
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/attrs.xml
View File

@@ -4911,7 +4911,7 @@
<!-- Y coordinate of the origin of the gradient within the shape. --> <!-- Y coordinate of the origin of the gradient within the shape. -->
<attr name="centerY" format="float|fraction" /> <attr name="centerY" format="float|fraction" />
<!-- Radius of the gradient, used only with radial gradient. --> <!-- Radius of the gradient, used only with radial gradient. -->
<attr name="gradientRadius" format="float|fraction" /> <attr name="gradientRadius" format="float|fraction|dimension" />
</declare-styleable> </declare-styleable>
<!-- Used to fill the shape of GradientDrawable with a solid color. --> <!-- Used to fill the shape of GradientDrawable with a solid color. -->

5
graphics/java/android/graphics/drawable/GradientDrawable.java
View File

@@ -1395,9 +1395,12 @@ public class GradientDrawable extends Drawable {
} else { } else {
radiusType = RADIUS_TYPE_FRACTION; radiusType = RADIUS_TYPE_FRACTION;
} }
} else { } else if (tv.type == TypedValue.TYPE_DIMENSION) {
radius = tv.getDimension(r.getDisplayMetrics()); radius = tv.getDimension(r.getDisplayMetrics());
radiusType = RADIUS_TYPE_PIXELS; radiusType = RADIUS_TYPE_PIXELS;
} else {
radius = tv.getFloat();
radiusType = RADIUS_TYPE_PIXELS;
} }
st.mGradientRadius = radius; st.mGradientRadius = radius;