diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-02-06 02:05:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-06 02:05:42 +0000 |
| commit | 0db6e6a567e25d560586863c7be654a0c1da5795 (patch) | |
| tree | b83391c46502ec44bdf297bed1db7f2aadb0eb70 /tools | |
| parent | a955314d905f8567c852226ce4f74994826e8777 (diff) | |
| parent | 35d56c0d67537e56fafebd8edf790026644fe8de (diff) | |
| download | frameworks_base-0db6e6a567e25d560586863c7be654a0c1da5795.zip frameworks_base-0db6e6a567e25d560586863c7be654a0c1da5795.tar.gz frameworks_base-0db6e6a567e25d560586863c7be654a0c1da5795.tar.bz2 | |
Merge "Optimize layout rendering in layoutlib" into klp-dev
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 57771e3..377d996 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 @@ -334,7 +334,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { 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); @@ -369,7 +369,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { // 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); |