summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2014-08-06 22:03:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-06 17:19:40 +0000
commit33559c96ad4f2847ad2667c6035b8afe2afe2970 (patch)
tree3e2532faf88fd7ad750449ac4621e5457db00598 /graphics/java
parentdc33b6170b5e2f049a333aa0025902bff5a4e99b (diff)
parentc4d651ec8a8c190c5df173166357c2fdf47472ce (diff)
downloadframeworks_base-33559c96ad4f2847ad2667c6035b8afe2afe2970.zip
frameworks_base-33559c96ad4f2847ad2667c6035b8afe2afe2970.tar.gz
frameworks_base-33559c96ad4f2847ad2667c6035b8afe2afe2970.tar.bz2
Merge "MiterLimit represent a ratio itself, no need to scale" into lmp-dev
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/drawable/VectorDrawable.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index d5ffa58..03d2326 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -883,7 +883,7 @@ public class VectorDrawable extends Drawable {
strokePaint.setStrokeCap(fullPath.mStrokeLineCap);
}
- strokePaint.setStrokeMiter(fullPath.mStrokeMiterlimit * minScale);
+ strokePaint.setStrokeMiter(fullPath.mStrokeMiterlimit);
strokePaint.setColor(applyAlpha(fullPath.mStrokeColor, stackedAlpha));
strokePaint.setStrokeWidth(fullPath.mStrokeWidth * minScale);