summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-05-23 16:43:57 -0700
committerXavier Ducrohet <xav@android.com>2011-05-23 17:51:22 -0700
commitc7b87766b21fe5cf2f644efa8753b936d413dc9a (patch)
tree4655c3dcd0de4b9466d4e7e3eb77c12d1deb422e
parent4e4ad34159dc1c720a3e6145bb9f14c60fb1a3f7 (diff)
downloadbase-c7b87766b21fe5cf2f644efa8753b936d413dc9a.tar.gz
Merge 2402ad60 from honeycomb-mr1. do not merge.
LayoutLib: Fix Canvas_Delegate.native_concat(). Change-Id: I863c43d65a929816ac7c9e69addcc647dac1878b
-rw-r--r--tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java2
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 49c1e4b6742e..e7ae185731a7 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);