diff options
| author | 2015-04-30 23:00:28 +0000 | |
|---|---|---|
| committer | 2015-04-30 23:00:29 +0000 | |
| commit | aba035d2ed4a0c39d59ca039b52af2bc3f5980b4 (patch) | |
| tree | e1b0a4237b897a38f358f450e168cfb600847797 | |
| parent | 5b8b0df7bfcbeb8a6ac165fcbcad57aa2b597004 (diff) | |
| parent | 5181f279c8740b9786be37a3a9459114e3f06dfd (diff) | |
Merge "Fix layoutlib build breakage" into mnc-dev
| -rw-r--r-- | tools/layoutlib/bridge/src/android/view/LayoutInflater_Delegate.java | 28 |
1 files 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 7f1e977f5b49..4072302be67e 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 <include /> tag. If @@ -179,19 +175,17 @@ 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; - // ---- 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); |