Merge "Fix a few found doc problems." (0f09c3d0) · Commits · e / os / android_frameworks_base

core/java/android/content/res/Configuration.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1314,7 +1314,8 @@ public final class Configuration implements Parcelable, Comparable<Configuration
		* {@link View#LAYOUT_DIRECTION_LTR}. If not null will set it to the layout direction
		* corresponding to the Locale.
		*
		* @see {@link View#LAYOUT_DIRECTION_LTR} and {@link View#LAYOUT_DIRECTION_RTL}
		* @see View#LAYOUT_DIRECTION_LTR
		* @see View#LAYOUT_DIRECTION_RTL
		*/
		public void setLayoutDirection(Locale locale) {
		// There is a "1" difference between the configuration values for

+2 −3

Original line number	Diff line number	Diff line
		@@ -19,13 +19,12 @@ package android.database;
		import android.database.sqlite.SQLiteDatabase;

		/**
		* An interface to let the apps define the actions to take when the following errors are detected
		* database corruption
		* An interface to let apps define an action to take when database corruption is detected.
		*/
		public interface DatabaseErrorHandler {

		/**
		* defines the method to be invoked when database corruption is detected.
		* The method invoked when database corruption is detected.
		* @param dbObj the {@link SQLiteDatabase} object representing the database on which corruption
		* is detected.
		*/

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import android.util.Log;
		import android.util.Pair;

		/**
		* Default class used to define the actions to take when the database corruption is reported
		* Default class used to define the action to take when database corruption is reported
		* by sqlite.
		* <p>
		* An application can specify an implementation of {@link DatabaseErrorHandler} on the
		@@ -38,7 +38,7 @@ import android.util.Pair;
		* The specified {@link DatabaseErrorHandler} is used to handle database corruption errors, if they
		* occur.
		* <p>
		* If null is specified for DatabaeErrorHandler param in the above calls, then this class is used
		* If null is specified for the DatabaseErrorHandler param in the above calls, this class is used
		* as the default {@link DatabaseErrorHandler}.
		*/
		public final class DefaultDatabaseErrorHandler implements DatabaseErrorHandler {

+2 −2

Original line number	Diff line number	Diff line
		@@ -1856,14 +1856,14 @@ public abstract class Window {
		public abstract int getStatusBarColor();

		/**
		* Sets the color of the status bar to {@param color}.
		* Sets the color of the status bar to {@code color}.
		*
		* For this to take effect,
		* the window must be drawing the system bar backgrounds with
		* {@link android.view.WindowManager.LayoutParams#FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS} and
		* {@link android.view.WindowManager.LayoutParams#FLAG_TRANSLUCENT_STATUS} must not be set.
		*
		* If {@param color} is not opaque, consider setting
		* If {@code color} is not opaque, consider setting
		* {@link android.view.View#SYSTEM_UI_FLAG_LAYOUT_STABLE} and
		* {@link android.view.View#SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN}.
		* <p>

+3 −3

Original line number	Diff line number	Diff line
		@@ -1500,18 +1500,18 @@ public class MediaRouter {

		/**
		* The default playback type, "local", indicating the presentation of the media is happening
		* on the same device (e.g. a phone, a tablet) as where it is controlled from.
		* on the same device (e.g. a phone, a tablet) as where it is controlled from.
		* @see #getPlaybackType()
		*/
		public final static int PLAYBACK_TYPE_LOCAL = 0;
		/**
		* A playback type indicating the presentation of the media is happening on
		* a different device (i.e. the remote device) than where it is controlled from.
		* a different device (i.e. the remote device) than where it is controlled from.
		* @see #getPlaybackType()
		*/
		public final static int PLAYBACK_TYPE_REMOTE = 1;
		/**
		* Playback information indicating the playback volume is fixed, i.e. it cannot be
		* Playback information indicating the playback volume is fixed, i.e. it cannot be
		* controlled from this object. An example of fixed playback volume is a remote player,
		* playing over HDMI where the user prefers to control the volume on the HDMI sink, rather
		* than attenuate at the source.