summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2014-08-26 18:18:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-26 18:18:16 +0000
commitae82e604fa5de40e737a83013f90eea2d7b514a2 (patch)
treefc0f922ba470759d81974280ce8b614e6868d51e /graphics/java
parentffc596bd22f946fda718ca48414af9a00b1ad6f2 (diff)
parenta70b4742a7a0b2edc57cbbbf83d2c6d43ebc300d (diff)
downloadframeworks_base-ae82e604fa5de40e737a83013f90eea2d7b514a2.zip
frameworks_base-ae82e604fa5de40e737a83013f90eea2d7b514a2.tar.gz
frameworks_base-ae82e604fa5de40e737a83013f90eea2d7b514a2.tar.bz2
Merge "VD: Update the fillColor default as transparent" into lmp-dev
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/drawable/VectorDrawable.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index 9ac6927..042da5b 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -119,7 +119,7 @@ import java.util.Stack;
* <dd>Defines path string. This is using exactly same format as "d" attribute
* in the SVG's path data. This is defined in the viewport space.</dd>
* <dt><code>android:fillColor</code></dt>
- * <dd>Defines the color to fill the path (black if not present).</dd>
+ * <dd>Defines the color to fill the path (none if not present).</dd>
* <dt><code>android:strokeColor</code></dt>
* <dd>Defines the color to draw the path outline (none if not present).</dd>
* <dt><code>android:strokeWidth</code></dt>
@@ -862,7 +862,7 @@ public class VectorDrawable extends Drawable {
}
mRenderPath.addPath(path, mFinalPathMatrix);
- if (fullPath.mFillColor != 0) {
+ if (fullPath.mFillColor != Color.TRANSPARENT) {
if (mFillPaint == null) {
mFillPaint = new Paint();
mFillPaint.setColorFilter(mColorFilter);
@@ -873,7 +873,7 @@ public class VectorDrawable extends Drawable {
canvas.drawPath(mRenderPath, mFillPaint);
}
- if (fullPath.mStrokeColor != 0) {
+ if (fullPath.mStrokeColor != Color.TRANSPARENT) {
if (mStrokePaint == null) {
mStrokePaint = new Paint();
mStrokePaint.setColorFilter(mColorFilter);
@@ -1237,9 +1237,9 @@ public class VectorDrawable extends Drawable {
// Variables below need to be copied (deep copy if applicable) for mutation.
private int[] mThemeAttrs;
- int mStrokeColor = 0;
+ int mStrokeColor = Color.TRANSPARENT;
float mStrokeWidth = 0;
- int mFillColor = Color.BLACK;
+ int mFillColor = Color.TRANSPARENT;
int mFillRule;
float mTrimPathStart = 0;
float mTrimPathEnd = 1;