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

am aba035d2: Merge "Fix layoutlib build breakage" into mnc-dev

Browse Source 
* commit 'aba035d2ed4a0c39d59ca039b52af2bc3f5980b4':
  Fix layoutlib build breakage
This commit is contained in:
Alan Viverette
2015-04-30 23:09:25 +00:00
committed by Android Git Automerger
parent 972e0c7b3e aba035d2ed
commit 343affaf7d
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/layoutlib/bridge/src/android/view/LayoutInflater_Delegate.java
View File

@ -164,10 +164,6 @@ public class LayoutInflater_Delegate {
com.android.internal.R.styleable.Include_id, View.NO_ID); com.android.internal.R.styleable.Include_id, View.NO_ID);
final int visibility = a.getInt( final int visibility = a.getInt(
com.android.internal.R.styleable.Include_visibility, -1); com.android.internal.R.styleable.Include_visibility, -1);
final boolean hasWidth = a.hasValue(
com.android.internal.R.styleable.Include_layout_width);
final boolean hasHeight = a.hasValue(
com.android.internal.R.styleable.Include_layout_height);
a.recycle(); a.recycle();
// We try to load the layout params set in the <include /> tag. If // We try to load the layout params set in the <include /> tag. If
@ -179,19 +175,17 @@ public class LayoutInflater_Delegate {
// successfully loaded layout params from the <include /> tag, // successfully loaded layout params from the <include /> tag,
// false means we need to rely on the included layout params. // false means we need to rely on the included layout params.
ViewGroup.LayoutParams params = null; ViewGroup.LayoutParams params = null;
if (hasWidth && hasHeight) { try {
try { // ---- START CHANGES
// ---- START CHANGES sIsInInclude = true;
sIsInInclude = true; // ---- END CHANGES
// ---- END CHANGES
params = group.generateLayoutParams(attrs); params = group.generateLayoutParams(attrs);
} finally { } finally {
// ---- START CHANGES // ---- START CHANGES
sIsInInclude = false; sIsInInclude = false;
// ---- END CHANGES // ---- END CHANGES
}
} }
if (params == null) { if (params == null) {
params = group.generateLayoutParams(childAttrs); params = group.generateLayoutParams(childAttrs);