diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-02-06 03:15:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-06 03:15:33 +0000 |
| commit | f7994e89e94d55998e63e9ebe74a8f10c05ccb3a (patch) | |
| tree | 3ea4f28f1399f2cf01be25b28098271f70fae154 /tools/layoutlib | |
| parent | a859670d0a135d9a33b57fcc450fafa09d9c5a7f (diff) | |
| parent | 6a9cbd5a2d56782e94b870735df51d32314684d8 (diff) | |
| download | frameworks_base-f7994e89e94d55998e63e9ebe74a8f10c05ccb3a.zip frameworks_base-f7994e89e94d55998e63e9ebe74a8f10c05ccb3a.tar.gz frameworks_base-f7994e89e94d55998e63e9ebe74a8f10c05ccb3a.tar.bz2 | |
am 6a9cbd5a: am a0023027: am 23de8dc2: am 28e049ef: am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev
* commit '6a9cbd5a2d56782e94b870735df51d32314684d8':
Optimize layout rendering in layoutlib
Diffstat (limited to 'tools/layoutlib')
| -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); |