From 5181f279c8740b9786be37a3a9459114e3f06dfd Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Thu, 30 Apr 2015 15:57:42 -0700 Subject: Fix layoutlib build breakage Change-Id: Id3a9b79ac47ef27b04a96ff3ee50688bbb58f9c0 --- .../src/android/view/LayoutInflater_Delegate.java | 28 +++++++++------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/tools/layoutlib/bridge/src/android/view/LayoutInflater_Delegate.java b/tools/layoutlib/bridge/src/android/view/LayoutInflater_Delegate.java index 7f1e977..4072302 100644 --- a/tools/layoutlib/bridge/src/android/view/LayoutInflater_Delegate.java +++ b/tools/layoutlib/bridge/src/android/view/LayoutInflater_Delegate.java @@ -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 tag. If @@ -179,19 +175,17 @@ public class LayoutInflater_Delegate { // successfully loaded layout params from the tag, // false means we need to rely on the included layout params. ViewGroup.LayoutParams params = null; - if (hasWidth && hasHeight) { - try { - // ---- START CHANGES - sIsInInclude = true; - // ---- END CHANGES - - params = group.generateLayoutParams(attrs); - - } finally { - // ---- START CHANGES - sIsInInclude = false; - // ---- END CHANGES - } + try { + // ---- START CHANGES + sIsInInclude = true; + // ---- END CHANGES + + params = group.generateLayoutParams(attrs); + + } finally { + // ---- START CHANGES + sIsInInclude = false; + // ---- END CHANGES } if (params == null) { params = group.generateLayoutParams(childAttrs); -- cgit v1.1