commit f14cbb26edcf0838cee333bf0d6ee686bf6de333
author Deepanshu Gupta <deepanshu@google.com> Wed Apr 16 18:33:10 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 16 18:33:11 2014 +0000
tree 06a55fd9deb976bfd1ca35ddcb9242a1c8d60edf
parent 2676e36ff6fc3f779cb6f1b0db13e26d734dcbab
parent 9e5e993c7969ad60ff70cfdcf707247f38a705a1

Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
index 9ddbbf1..7e09195 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
@@ -335,7 +335,7 @@
                 backgroundView = backgroundLayout;
                 backgroundLayout.setOrientation(LinearLayout.VERTICAL);
                 LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
-                        LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+                        LayoutParams.MATCH_PARENT, 0);
                 layoutParams.weight = 1;
                 backgroundLayout.setLayoutParams(layoutParams);
                 topLayout.addView(backgroundLayout);
@@ -370,7 +370,7 @@
                 // content frame
                 mContentRoot = new FrameLayout(context);
                 layoutParams = new LinearLayout.LayoutParams(
-                        LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+                        LayoutParams.MATCH_PARENT, 0);
                 layoutParams.weight = 1;
                 mContentRoot.setLayoutParams(layoutParams);
                 backgroundLayout.addView(mContentRoot);