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

Merge "Add support for assigning keyed View tags via XML"

Browse Source
This commit is contained in:
Alan Viverette
2014-02-12 20:46:38 +00:00
committed by Android (Google) Code Review
parent f556adf45e 451a3417e9
commit 09591e89e4
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,6 +90,7 @@ public abstract class LayoutInflater {
private static final String TAG_INCLUDE = "include";
private static final String TAG_1995 = "blink";
private static final String TAG_REQUEST_FOCUS = "requestFocus";
private static final String TAG_TAG = "tag";
private static final int[] ATTRS_THEME = new int[] {
com.android.internal.R.attr.theme };
@@ -778,6 +779,8 @@ public abstract class LayoutInflater {
if (TAG_REQUEST_FOCUS.equals(name)) {
parseRequestFocus(parser, parent);
} else if (TAG_TAG.equals(name)) {
parseViewTag(parser, parent, attrs);
} else if (TAG_INCLUDE.equals(name)) {
if (parser.getDepth() == 0) {
throw new InflateException("<include /> cannot be the root element");
@@ -797,10 +800,36 @@ public abstract class LayoutInflater {
if (finishInflate) parent.onFinishInflate();
}
private void parseRequestFocus(XmlPullParser parser, View parent)
/**
* Parses a <code>&lt;request-focus&gt;</code> element and requests focus on
* the containing View.
*/
private void parseRequestFocus(XmlPullParser parser, View view)
throws XmlPullParserException, IOException {
int type;
parent.requestFocus();
view.requestFocus();
final int currentDepth = parser.getDepth();
while (((type = parser.next()) != XmlPullParser.END_TAG ||
parser.getDepth() > currentDepth) && type != XmlPullParser.END_DOCUMENT) {
// Empty
}
}
/**
* Parses a <code>&lt;tag&gt;</code> element and sets a keyed tag on the
* containing View.
*/
private void parseViewTag(XmlPullParser parser, View view, AttributeSet attrs)
throws XmlPullParserException, IOException {
int type;
final TypedArray ta = mContext.obtainStyledAttributes(
attrs, com.android.internal.R.styleable.ViewTag);
final int key = ta.getResourceId(com.android.internal.R.styleable.ViewTag_id, 0);
final CharSequence value = ta.getText(com.android.internal.R.styleable.ViewTag_value);
view.setTag(key, value);
ta.recycle();
final int currentDepth = parser.getDepth();
while (((type = parser.next()) != XmlPullParser.END_TAG ||
parser.getDepth() > currentDepth) && type != XmlPullParser.END_DOCUMENT) {

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

@@ -2257,6 +2257,14 @@
<attr name="sharedElementName" format="string" />
</declare-styleable>
<!-- Attributes that can be assigned to a tag for a particular View. -->
<declare-styleable name="ViewTag">
<!-- Specifies the key identifying a tag. This must be a resource reference. -->
<attr name="id" />
<!-- Specifies the value with which to tag the view. -->
<attr name="value" />
</declare-styleable>
<!-- Attributes that can be used with a {@link android.view.ViewGroup} or any
of its subclasses. Also see {@link #ViewGroup_Layout} for
attributes that this class processes in its children. -->