am 343affaf: am aba035d2: Merge "Fix layoutlib build breakage" into mnc-dev (022fd57a) · Commits · e / os / android_frameworks_base

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

+11 −17

Original line number	Diff line number	Diff line
		@@ -164,10 +164,6 @@ public class LayoutInflater_Delegate {
		com.android.internal.R.styleable.Include_id, View.NO_ID);
		final int visibility = a.getInt(
		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();

		// 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,
		// false means we need to rely on the included layout params.
		ViewGroup.LayoutParams params = null;
		if (hasWidth && hasHeight) {
		try {
		// ---- START CHANGES
		sIsInInclude = true;
		@@ -192,7 +187,6 @@ public class LayoutInflater_Delegate {
		sIsInInclude = false;
		// ---- END CHANGES
		}
		}
		if (params == null) {
		params = group.generateLayoutParams(childAttrs);
		}