diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-07 17:17:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-07 17:17:11 -0700 |
| commit | f18e311ee5d35db0cae96f0b216a88e5b42604dc (patch) | |
| tree | 60ddaf1c2c9936d4711c93a82705cdd325e1fa53 /tools/layoutlib/bridge/src/android/graphics | |
| parent | c8307c885f8462f2baf9f06c9916d1521f7fdcfb (diff) | |
| parent | abc838716816107754ab0479242d03807ce79fc2 (diff) | |
| download | frameworks_base-f18e311ee5d35db0cae96f0b216a88e5b42604dc.zip frameworks_base-f18e311ee5d35db0cae96f0b216a88e5b42604dc.tar.gz frameworks_base-f18e311ee5d35db0cae96f0b216a88e5b42604dc.tar.bz2 | |
am abc83871: am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2
* commit 'abc838716816107754ab0479242d03807ce79fc2':
Import the Layoutlib from hc-mr1.
Diffstat (limited to 'tools/layoutlib/bridge/src/android/graphics')
| -rw-r--r-- | tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java | 4 |
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 922cd4c..8e3ed93 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java @@ -425,7 +425,7 @@ public final class Canvas_Delegate { AffineTransform matrixTx = matrixDelegate.getAffineTransform(); // combine them so that the given matrix is applied after. - currentTx.preConcatenate(matrixTx); + currentTx.concatenate(matrixTx); // give it to the graphics2D as a new matrix replacing all previous transform snapshot.setTransform(currentTx); @@ -717,7 +717,7 @@ public final class Canvas_Delegate { /*package*/ static void native_drawCircle(int nativeCanvas, float cx, float cy, float radius, int paint) { native_drawOval(nativeCanvas, - new RectF(cx - radius, cy - radius, radius*2, radius*2), + new RectF(cx - radius, cy - radius, radius, radius), paint); } |