Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix layoutlib build breakage

Browse Source 
Change-Id: Id3a9b79ac47ef27b04a96ff3ee50688bbb58f9c0
This commit is contained in:
Alan Viverette
2015-04-30 15:57:42 -07:00
parent 7dc7d09ba5
commit 5181f279c8
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);
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
try {
// ---- START CHANGES
sIsInInclude = true;
// ---- END CHANGES
params = group.generateLayoutParams(attrs);
params = group.generateLayoutParams(attrs);
} finally {
// ---- START CHANGES
sIsInInclude = false;
// ---- END CHANGES
}
} finally {
// ---- START CHANGES
sIsInInclude = false;
// ---- END CHANGES
}
if (params == null) {
params = group.generateLayoutParams(childAttrs);