drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0db6e6a5: Merge "Optimize layout rendering in layoutlib" into klp-dev

Browse Source 
* commit '0db6e6a567e25d560586863c7be654a0c1da5795':
  Optimize layout rendering in layoutlib
This commit is contained in:
Deepanshu Gupta
2014-02-06 02:56:42 +00:00
committed by Android Git Automerger
parent f2f108fe86 0db6e6a567
commit 28e049ef73
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
View File

@ -334,7 +334,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
backgroundView = backgroundLayout; backgroundView = backgroundLayout;
backgroundLayout.setOrientation(LinearLayout.VERTICAL); backgroundLayout.setOrientation(LinearLayout.VERTICAL);
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); LayoutParams.MATCH_PARENT, 0);
layoutParams.weight = 1; layoutParams.weight = 1;
backgroundLayout.setLayoutParams(layoutParams); backgroundLayout.setLayoutParams(layoutParams);
topLayout.addView(backgroundLayout); topLayout.addView(backgroundLayout);
@ -369,7 +369,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
// content frame // content frame
mContentRoot = new FrameLayout(context); mContentRoot = new FrameLayout(context);
layoutParams = new LinearLayout.LayoutParams( layoutParams = new LinearLayout.LayoutParams(
LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); LayoutParams.MATCH_PARENT, 0);
layoutParams.weight = 1; layoutParams.weight = 1;
mContentRoot.setLayoutParams(layoutParams); mContentRoot.setLayoutParams(layoutParams);
backgroundLayout.addView(mContentRoot); backgroundLayout.addView(mContentRoot);