Merge "Add AttributeSet.getAttributeNamespace()." (eb50aec1) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -44903,6 +44903,7 @@ package android.util {
		method public abstract int getAttributeListValue(int, java.lang.String[], int);
		method public abstract java.lang.String getAttributeName(int);
		method public abstract int getAttributeNameResource(int);
		method public default java.lang.String getAttributeNamespace(int);
		method public abstract int getAttributeResourceValue(java.lang.String, java.lang.String, int);
		method public abstract int getAttributeResourceValue(int, int);
		method public abstract int getAttributeUnsignedIntValue(java.lang.String, java.lang.String, int);

core/java/android/content/res/XmlResourceParser.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@ import org.xmlpull.v1.XmlPullParser;
		* it is done reading the resource.
		*/
		public interface XmlResourceParser extends XmlPullParser, AttributeSet, AutoCloseable {
		String getAttributeNamespace (int index);

		/**
		* Close this parser. Calls on the interface are no longer valid after this call.
		*/

core/java/android/util/AttributeSet.java

+28 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		package android.util;


		import org.xmlpull.v1.XmlPullParser;

		/**
		* A collection of attributes, as found associated with a tag in an XML
		* document. Often you will not want to use this interface directly, instead
		@@ -54,18 +56,42 @@ package android.util;
		* compiled XML resource that is not available in a normal XML file, such
		* as {@link #getAttributeNameResource(int)} which returns the resource
		* identifier associated with a particular XML attribute name.
		*
		* @see XmlPullParser
		*/
		public interface AttributeSet {
		/**
		* Returns the number of attributes available in the set.
		*
		* <p>See also {@link XmlPullParser#getAttributeCount XmlPullParser.getAttributeCount()},
		* which this method corresponds to when parsing a compiled XML file.</p>
		*
		* @return A positive integer, or 0 if the set is empty.
		*/
		public int getAttributeCount();

		/**
		* Returns the namespace of the specified attribute.
		*
		* <p>See also {@link XmlPullParser#getAttributeNamespace XmlPullParser.getAttributeNamespace()},
		* which this method corresponds to when parsing a compiled XML file.</p>
		*
		* @param index Index of the desired attribute, 0...count-1.
		*
		* @return A String containing the namespace of the attribute, or null if th
		* attribute cannot be found.
		*/
		default String getAttributeNamespace (int index) {
		// This is a new method since the first interface definition, so add stub impl.
		return null;
		}

		/**
		* Returns the name of the specified attribute.
		*
		* <p>See also {@link XmlPullParser#getAttributeName XmlPullParser.getAttributeName()},
		* which this method corresponds to when parsing a compiled XML file.</p>
		*
		* @param index Index of the desired attribute, 0...count-1.
		*
		* @return A String containing the name of the attribute, or null if the

core/java/android/util/XmlPullAttributes.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,10 @@ class XmlPullAttributes implements AttributeSet {
		return mParser.getAttributeCount();
		}

		public String getAttributeNamespace (int index) {
		return mParser.getAttributeNamespace(index);
		}

		public String getAttributeName(int index) {
		return mParser.getAttributeName(index);
		}