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

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

Browse Source 
* commit '7c133e19ddabe753a9c0d49d814c89f9df4121ad':
  Fix gradient drawable radius when specified as float, dimension
This commit is contained in:
Alan Viverette
2014-10-21 18:33:26 +00:00
committed by Android Git Automerger
parent e941116169 7c133e19dd
commit ed89e45253
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. -->
<attr name="centerY" format="float|fraction" />
<!-- Radius of the gradient, used only with radial gradient. -->
<attr name="gradientRadius" format="float|fraction" />
<attr name="gradientRadius" format="float|fraction|dimension" />
</declare-styleable>
<!-- 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 {
radiusType = RADIUS_TYPE_FRACTION;
}
} else {
} else if (tv.type == TypedValue.TYPE_DIMENSION) {
radius = tv.getDimension(r.getDisplayMetrics());
radiusType = RADIUS_TYPE_PIXELS;
} else {
radius = tv.getFloat();
radiusType = RADIUS_TYPE_PIXELS;
}
st.mGradientRadius = radius;