summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge/src/android
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2015-03-25 00:29:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-25 00:29:50 +0000
commit3ae0bc032ae52db536f19d4468d08941b851d8a6 (patch)
treefb577766e277d01d9c3e5cef8c7e6a9a09c38992 /tools/layoutlib/bridge/src/android
parentcb580742e364f29bdd78ee5532d1c00279419e48 (diff)
parente2b8501695c4ba5712d49313e86a566e95a5b0df (diff)
downloadframeworks_base-3ae0bc032ae52db536f19d4468d08941b851d8a6.zip
frameworks_base-3ae0bc032ae52db536f19d4468d08941b851d8a6.tar.gz
frameworks_base-3ae0bc032ae52db536f19d4468d08941b851d8a6.tar.bz2
am e2b85016: am ce2b74f7: am e51f5cdc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
* commit 'e2b8501695c4ba5712d49313e86a566e95a5b0df': Fix RoundRect radius.
Diffstat (limited to 'tools/layoutlib/bridge/src/android')
-rw-r--r--tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java
index be75dde..4d2d100 100644
--- a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java
@@ -675,7 +675,7 @@ public final class Canvas_Delegate {
graphics.fillRoundRect(
(int)left, (int)top,
(int)(right - left), (int)(bottom - top),
- (int)rx, (int)ry);
+ 2 * (int)rx, 2 * (int)ry);
}
if (style == Paint.Style.STROKE.nativeInt ||
@@ -683,7 +683,7 @@ public final class Canvas_Delegate {
graphics.drawRoundRect(
(int)left, (int)top,
(int)(right - left), (int)(bottom - top),
- (int)rx, (int)ry);
+ 2 * (int)rx, 2 * (int)ry);
}
}
});