Merge "Remove remaining doc references to StyledAttributes." (4e7ec240) · Commits · e / os / android_frameworks_base

core/java/android/content/res/Resources.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -1118,7 +1118,7 @@ public class Resources {
		}

		/**
		* Return a StyledAttributes holding the values defined by
		* Return a TypedArray holding the values defined by
		* <var>Theme</var> which are listed in <var>attrs</var>.
		*
		* <p>Be sure to call {@link TypedArray#recycle() TypedArray.recycle()} when you are done
		@@ -1146,7 +1146,7 @@ public class Resources {
		}

		/**
		* Return a StyledAttributes holding the values defined by the style
		* Return a TypedArray holding the values defined by the style
		* resource <var>resid</var> which are listed in <var>attrs</var>.
		*
		* <p>Be sure to call {@link TypedArray#recycle() TypedArray.recycle()} when you are done
		@@ -1203,7 +1203,7 @@ public class Resources {
		}

		/**
		* Return a StyledAttributes holding the attribute values in
		* Return a TypedArray holding the attribute values in
		* <var>set</var>
		* that are listed in <var>attrs</var>. In addition, if the given
		* AttributeSet specifies a style class (through the "style" attribute),
		@@ -1235,10 +1235,10 @@ public class Resources {
		* @param attrs The desired attributes to be retrieved.
		* @param defStyleAttr An attribute in the current theme that contains a
		* reference to a style resource that supplies
		* defaults values for the StyledAttributes. Can be
		* defaults values for the TypedArray. Can be
		* 0 to not look for defaults.
		* @param defStyleRes A resource identifier of a style resource that
		* supplies default values for the StyledAttributes,
		* supplies default values for the TypedArray,
		* used only if defStyleAttr is 0 or can not be found
		* in the theme. Can be 0 to not look for defaults.
		*

core/java/android/widget/TextView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -7727,7 +7727,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

		/**
		* Returns the TextView_textColor attribute from the
		* Resources.StyledAttributes, if set, or the TextAppearance_textColor
		* TypedArray, if set, or the TextAppearance_textColor
		* from the TextView_textAppearance attribute, if TextView_textColor
		* was not set directly.
		*/

tools/layoutlib/bridge/src/android/content/res/BridgeTypedArray.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -894,7 +894,7 @@ public final class BridgeTypedArray extends TypedArray {
		}

		/**
		* Give back a previously retrieved StyledAttributes, for later re-use.
		* Give back a previously retrieved TypedArray, for later re-use.
		*/
		@Override
		public void recycle() {