Merge "Various doc cleanups" (c5d2192f) · Commits · e / os / android_frameworks_base

core/res/res/values/attrs.xml

+12 −7

Original line number	Original line	Diff line number	Diff line
	@@ -2334,8 +2334,8 @@ i
	<!-- Defines whether the vertical scrollbar track should always be drawn. -->		<!-- Defines whether the vertical scrollbar track should always be drawn. -->
	<attr name="scrollbarAlwaysDrawVerticalTrack" format="boolean" />		<attr name="scrollbarAlwaysDrawVerticalTrack" format="boolean" />

	<!-- This attribute is deprecated and will be ignored as of		<!-- This attribute is ignored in API level 14
	API level 14 ({@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH}).		({@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH}) and higher.
	Using fading edges may introduce noticeable performance		Using fading edges may introduce noticeable performance
	degradations and should be used only when required by the application's		degradations and should be used only when required by the application's
	visual design. To request fading edges with API level 14 and above,		visual design. To request fading edges with API level 14 and above,
	@@ -2571,7 +2571,7 @@ i

	<!-- Defines the direction of layout drawing. This typically is associated with writing		<!-- Defines the direction of layout drawing. This typically is associated with writing
	direction of the language script used. The possible values are "ltr" for Left-to-Right,		direction of the language script used. The possible values are "ltr" for Left-to-Right,
	"rtl" for Right-to-Left, "locale" and "inherit" from parent view. If there is nothing		"rtl" for Right-to-Left, "locale", and "inherit" from parent view. If there is nothing
	to inherit, "locale" is used. "locale" falls back to "en-US". "ltr" is the direction		to inherit, "locale" is used. "locale" falls back to "en-US". "ltr" is the direction
	used in "en-US". The default for this attribute is "inherit". -->		used in "en-US". The default for this attribute is "inherit". -->
	<attr name="layoutDirection">		<attr name="layoutDirection">
	@@ -2585,8 +2585,7 @@ i
	<enum name="locale" value="3" />		<enum name="locale" value="3" />
	</attr>		</attr>

	<!-- Defines the direction of the text. A heuristic is used to determine the resolved text		<!-- Defines the direction of the text. -->
	direction of paragraphs. -->
	<attr name="textDirection" format="integer">		<attr name="textDirection" format="integer">
	<!-- Default -->		<!-- Default -->
	<enum name="inherit" value="0" />		<enum name="inherit" value="0" />
	@@ -2612,8 +2611,7 @@ i
	<enum name="firstStrongRtl" value="7" />		<enum name="firstStrongRtl" value="7" />
	</attr>		</attr>

	<!-- Defines the alignment of the text. A heuristic is used to determine the resolved		<!-- Defines the alignment of the text. -->
	text alignment. -->
	<attr name="textAlignment" format="integer">		<attr name="textAlignment" format="integer">
	<!-- Default -->		<!-- Default -->
	<enum name="inherit" value="0" />		<enum name="inherit" value="0" />
	@@ -4934,7 +4932,14 @@ i
	<declare-styleable name="LinearLayout_Layout">		<declare-styleable name="LinearLayout_Layout">
	<attr name="layout_width" />		<attr name="layout_width" />
	<attr name="layout_height" />		<attr name="layout_height" />
			<!-- Indicates how much of the extra space in the LinearLayout is
			allocated to the view associated with these LayoutParams. Specify
			0 if the view should not be stretched. Otherwise the extra pixels
			will be pro-rated among all views whose weight is greater than 0. -->
	<attr name="layout_weight" format="float" />		<attr name="layout_weight" format="float" />
			<!-- Gravity specifies how a component should be placed in its group of cells.
			The default is {@link android.view.Gravity#TOP}.
			See {@link android.widget.LinearLayout#setGravity(int)}. -->
	<attr name="layout_gravity" />		<attr name="layout_gravity" />
	</declare-styleable>		</declare-styleable>
	<declare-styleable name="GridLayout_Layout">		<declare-styleable name="GridLayout_Layout">

core/res/res/values/attrs_manifest.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1305,7 +1305,7 @@
	<attr name="cantSaveState" format="boolean" />		<attr name="cantSaveState" format="boolean" />
	<attr name="uiOptions" />		<attr name="uiOptions" />
	<!-- Declare that your application will be able to deal with RTL (right to left) layouts.		<!-- Declare that your application will be able to deal with RTL (right to left) layouts.
	If set to false (default value), your application will not care about RTL layouts. -->		The default value is false. -->
	<attr name="supportsRtl" format="boolean" />		<attr name="supportsRtl" format="boolean" />
	<!-- Declare that this application requires access to restricted accounts of a certain		<!-- Declare that this application requires access to restricted accounts of a certain
	type. The default value is null and restricted accounts won\'t be visible to this		type. The default value is null and restricted accounts won\'t be visible to this

graphics/java/android/graphics/Canvas.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -857,6 +857,15 @@ public class Canvas {
	nativeSetDrawFilter(mNativeCanvasWrapper, nativeFilter);		nativeSetDrawFilter(mNativeCanvasWrapper, nativeFilter);
	}		}

			/**
			* Constant values used as parameters to {@code quickReject()} calls. These values
			* specify how much space around the shape should be accounted for, depending on whether
			* the shaped area is antialiased or not.
			*
			* @see #quickReject(float, float, float, float, EdgeType)
			* @see #quickReject(Path, EdgeType)
			* @see #quickReject(RectF, EdgeType)
			*/
	public enum EdgeType {		public enum EdgeType {

	/**		/**

graphics/java/android/graphics/Paint.java

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1641,10 +1641,27 @@ public class Paint {
	* integers.		* integers.
	*/		*/
	public static class FontMetricsInt {		public static class FontMetricsInt {
			/**
			* The maximum distance above the baseline for the tallest glyph in
			* the font at a given text size.
			*/
	public int top;		public int top;
			/**
			* The recommended distance above the baseline for singled spaced text.
			*/
	public int ascent;		public int ascent;
			/**
			* The recommended distance below the baseline for singled spaced text.
			*/
	public int descent;		public int descent;
			/**
			* The maximum distance below the baseline for the lowest glyph in
			* the font at a given text size.
			*/
	public int bottom;		public int bottom;
			/**
			* The recommended additional space to add between lines of text.
			*/
	public int leading;		public int leading;

	@Override public String toString() {		@Override public String toString() {

core/java/android/widget/LinearLayout.java

+2 −2

File changed.

Contains only whitespace changes.