diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-05-24 10:54:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-24 10:54:35 -0700 |
| commit | af83d4ecff0ad1638a1a0f3a3f9805468ed710b4 (patch) | |
| tree | 1710ee0a1548b01ce34f9b0d95ce3c8004c52950 /tools | |
| parent | a38fad37c21a13ddf1cc14e5a960f395af558ee8 (diff) | |
| parent | c7b87766b21fe5cf2f644efa8753b936d413dc9a (diff) | |
| download | frameworks_base-af83d4ecff0ad1638a1a0f3a3f9805468ed710b4.zip frameworks_base-af83d4ecff0ad1638a1a0f3a3f9805468ed710b4.tar.gz frameworks_base-af83d4ecff0ad1638a1a0f3a3f9805468ed710b4.tar.bz2 | |
am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.
* commit 'c7b87766b21fe5cf2f644efa8753b936d413dc9a':
Merge 2402ad60 from honeycomb-mr1. do not merge.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java index 49c1e4b..e7ae185 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java @@ -443,7 +443,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); |