diff options
author | Xavier Ducrohet <xav@android.com> | 2010-12-14 14:32:09 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-14 14:32:09 -0800 |
commit | dcc995c72fffcb37ede82c1a040e2ae93fdcb065 (patch) | |
tree | 0a391f5ddf177b4db0f69c2ec822dd398a75a54d | |
parent | 3be80f2e6cf763fdfeb058d5a4ac8257cdc91135 (diff) | |
parent | f1416e4dffb0874f163febfa12f2648eac0c3a77 (diff) | |
download | frameworks_base-dcc995c72fffcb37ede82c1a040e2ae93fdcb065.zip frameworks_base-dcc995c72fffcb37ede82c1a040e2ae93fdcb065.tar.gz frameworks_base-dcc995c72fffcb37ede82c1a040e2ae93fdcb065.tar.bz2 |
Merge "LayoutLib: Misc fix to rendering."
3 files changed, 4 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/BitmapFactory.java b/tools/layoutlib/bridge/src/android/graphics/BitmapFactory.java index cd62baf..626f878 100644 --- a/tools/layoutlib/bridge/src/android/graphics/BitmapFactory.java +++ b/tools/layoutlib/bridge/src/android/graphics/BitmapFactory.java @@ -351,6 +351,7 @@ public class BitmapFactory { If the exception happened on open, bm will be null. If it happened on close, bm is still valid. */ + Bridge.getLog().error(null, e); } finally { try { if (is != null) is.close(); diff --git a/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java index b2333f6..bef8c8c 100644 --- a/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/Matrix_Delegate.java @@ -869,7 +869,7 @@ public final class Matrix_Delegate { tmpDest = new float[dstIndex + pointCount * 2]; } - for (int i = 0 ; i < pointCount ; i++) { + for (int i = 0 ; i < pointCount * 2 ; i += 2) { // just in case we are doing in place, we better put this in temp vars float x = mValues[0] * src[i + srcIndex] + mValues[1] * src[i + srcIndex + 1] + diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/LayoutSceneImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/LayoutSceneImpl.java index 6146cd4..24cf380 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/LayoutSceneImpl.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/LayoutSceneImpl.java @@ -152,6 +152,8 @@ public class LayoutSceneImpl { return result; } + Bridge.setLog(mParams.getLog()); + // setup the display Metrics. DisplayMetrics metrics = new DisplayMetrics(); metrics.densityDpi = mParams.getDensity(); |