From c7b87766b21fe5cf2f644efa8753b936d413dc9a Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Mon, 23 May 2011 16:43:57 -0700 Subject: [PATCH] Merge 2402ad60 from honeycomb-mr1. do not merge. LayoutLib: Fix Canvas_Delegate.native_concat(). Change-Id: I863c43d65a929816ac7c9e69addcc647dac1878b --- .../layoutlib/bridge/src/android/graphics/Canvas_Delegate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Canvas_Delegate.java index 49c1e4b6742ef..e7ae185731a77 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);