Merge "Fix layoutlib build breakage" into mnc-dev (aba035d2) · Commits · e / os / android_frameworks_base

tools/layoutlib/bridge/src/android/view/LayoutInflater_Delegate.java

+11 −17

Original line number	Original line	Diff line number	Diff line
	@@ -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,7 +175,6 @@ 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;
	@@ -192,7 +187,6 @@ public class LayoutInflater_Delegate {
	sIsInInclude = false;		sIsInInclude = false;
	// ---- END CHANGES		// ---- END CHANGES
	}		}
	}
	if (params == null) {		if (params == null) {
	params = group.generateLayoutParams(childAttrs);		params = group.generateLayoutParams(childAttrs);
	}		}