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

am ac7927a8: Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev

Browse Source 
* commit 'ac7927a89519a79ab73723a13ed9ea12ca16056f':
  LayoutInflater should always try to generate LayoutParams for include
This commit is contained in:
Alan Viverette
2015-04-30 21:09:51 +00:00
committed by Android Git Automerger
parent c8b068ce47 ac7927a895
commit 877063589a
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/view/LayoutInflater.java
View File

@@ -946,25 +946,21 @@ public abstract class LayoutInflater {
attrs, R.styleable.Include);
final int id = a.getResourceId(R.styleable.Include_id, View.NO_ID);
final int visibility = a.getInt(R.styleable.Include_visibility, -1);
final boolean hasWidth = a.hasValue(R.styleable.Include_layout_width);
final boolean hasHeight = a.hasValue(R.styleable.Include_layout_height);
a.recycle();
// We try to load the layout params set in the <include /> tag. If
// they don't exist, we will rely on the layout params set in the
// included XML file.
// During a layoutparams generation, a runtime exception is thrown
// if either layout_width or layout_height is missing. We catch
// this exception and set localParams accordingly: true means we
// successfully loaded layout params from the <include /> tag,
// false means we need to rely on the included layout params.
// We try to load the layout params set in the <include /> tag.
// If the parent can't generate layout params (ex. missing width
// or height for the framework ViewGroups, though this is not
// necessarily true of all ViewGroups) then we expect it to throw
// a runtime exception.
// We catch this exception and set localParams accordingly: true
// means we 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 {
params = group.generateLayoutParams(attrs);
} catch (RuntimeException e) {
// Ignore, just fail over to child attrs.
}
try {
params = group.generateLayoutParams(attrs);
} catch (RuntimeException e) {
// Ignore, just fail over to child attrs.
}
if (params == null) {
params = group.generateLayoutParams(childAttrs);

5
core/res/res/values/attrs.xml
View File

@@ -2725,12 +2725,11 @@
<attr name="value" />
</declare-styleable>
<!-- Attributes that can be assigned to an &lt;include&gt; tag. -->
<!-- Attributes that can be assigned to an &lt;include&gt; tag.
@hide -->
<declare-styleable name="Include">
<attr name="id" />
<attr name="visibility" />
<attr name="layout_width" />
<attr name="layout_height" />
</declare-styleable>
<!-- Attributes that can be used with a {@link android.view.ViewGroup} or any