Merge "docs: fixing errors found with lint check" into pi-dev (8c7d2142) · Commits · e / os / android_frameworks_base

core/java/android/accounts/AccountAuthenticatorActivity.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -48,7 +48,7 @@ public class AccountAuthenticatorActivity extends Activity {
	}		}

	/**		/**
	* Retreives the AccountAuthenticatorResponse from either the intent of the icicle, if the		* Retrieves the AccountAuthenticatorResponse from either the intent of the icicle, if the
	* icicle is non-zero.		* icicle is non-zero.
	* @param icicle the save instance data of this Activity, may be null		* @param icicle the save instance data of this Activity, may be null
	*/		*/

core/java/android/animation/Keyframe.java

+3 −3

core/java/android/app/Activity.java

+3 −3

core/java/android/app/ActivityOptions.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1474,7 +1474,7 @@ public class ActivityOptions {
	}		}

	/**		/**
	* Ask the the system track that time the user spends in the app being launched, and		* Ask the system track that time the user spends in the app being launched, and
	* report it back once done. The report will be sent to the given receiver, with		* report it back once done. The report will be sent to the given receiver, with
	* the extras {@link #EXTRA_USAGE_TIME_REPORT} and {@link #EXTRA_USAGE_TIME_REPORT_PACKAGES}		* the extras {@link #EXTRA_USAGE_TIME_REPORT} and {@link #EXTRA_USAGE_TIME_REPORT_PACKAGES}
	* filled in.		* filled in.

core/java/android/app/Fragment.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -76,7 +76,7 @@ public abstract class Keyframe implements Cloneable {
	* @param fraction The time, expressed as a value between 0 and 1, representing the fraction		* @param fraction The time, expressed as a value between 0 and 1, representing the fraction
	* of time elapsed of the overall animation duration.		* of time elapsed of the overall animation duration.
	* @param value The value that the object will animate to as the animation time approaches		* @param value The value that the object will animate to as the animation time approaches
	* the time in this keyframe, and the the value animated from as the time passes the time in		* the time in this keyframe, and the value animated from as the time passes the time in
	* this keyframe.		* this keyframe.
	*/		*/
	public static Keyframe ofInt(float fraction, int value) {		public static Keyframe ofInt(float fraction, int value) {
	@@ -108,7 +108,7 @@ public abstract class Keyframe implements Cloneable {
	* @param fraction The time, expressed as a value between 0 and 1, representing the fraction		* @param fraction The time, expressed as a value between 0 and 1, representing the fraction
	* of time elapsed of the overall animation duration.		* of time elapsed of the overall animation duration.
	* @param value The value that the object will animate to as the animation time approaches		* @param value The value that the object will animate to as the animation time approaches
	* the time in this keyframe, and the the value animated from as the time passes the time in		* the time in this keyframe, and the value animated from as the time passes the time in
	* this keyframe.		* this keyframe.
	*/		*/
	public static Keyframe ofFloat(float fraction, float value) {		public static Keyframe ofFloat(float fraction, float value) {
	@@ -140,7 +140,7 @@ public abstract class Keyframe implements Cloneable {
	* @param fraction The time, expressed as a value between 0 and 1, representing the fraction		* @param fraction The time, expressed as a value between 0 and 1, representing the fraction
	* of time elapsed of the overall animation duration.		* of time elapsed of the overall animation duration.
	* @param value The value that the object will animate to as the animation time approaches		* @param value The value that the object will animate to as the animation time approaches
	* the time in this keyframe, and the the value animated from as the time passes the time in		* the time in this keyframe, and the value animated from as the time passes the time in
	* this keyframe.		* this keyframe.
	*/		*/
	public static Keyframe ofObject(float fraction, Object value) {		public static Keyframe ofObject(float fraction, Object value) {

Original line number	Original line	Diff line number	Diff line
	@@ -2901,7 +2901,7 @@ public class Activity extends ContextThemeWrapper
	/**		/**
	* Use with {@link #setDefaultKeyMode} to specify that unhandled keystrokes		* Use with {@link #setDefaultKeyMode} to specify that unhandled keystrokes
	* will start an application-defined search. (If the application or activity does not		* will start an application-defined search. (If the application or activity does not
	* actually define a search, the the keys will be ignored.)		* actually define a search, the keys will be ignored.)
	*		*
	* <p>See {@link android.app.SearchManager android.app.SearchManager} for more details.		* <p>See {@link android.app.SearchManager android.app.SearchManager} for more details.
	*		*
	@@ -3201,7 +3201,7 @@ public class Activity extends ContextThemeWrapper
	* interacted with the device in some way while your activity is running.		* interacted with the device in some way while your activity is running.
	* This callback and {@link #onUserLeaveHint} are intended to help		* This callback and {@link #onUserLeaveHint} are intended to help
	* activities manage status bar notifications intelligently; specifically,		* activities manage status bar notifications intelligently; specifically,
	* for helping activities determine the proper time to cancel a notfication.		* for helping activities determine the proper time to cancel a notification.
	*		*
	* <p>All calls to your activity's {@link #onUserLeaveHint} callback will		* <p>All calls to your activity's {@link #onUserLeaveHint} callback will
	* be accompanied by calls to {@link #onUserInteraction}. This		* be accompanied by calls to {@link #onUserInteraction}. This
	@@ -7828,7 +7828,7 @@ public class Activity extends ContextThemeWrapper
	}		}

	/**		/**
	* Specifies whether an {@link Activity} should be shown on top of the the lock screen whenever		* Specifies whether an {@link Activity} should be shown on top of the lock screen whenever
	* the lockscreen is up and the activity is resumed. Normally an activity will be transitioned		* the lockscreen is up and the activity is resumed. Normally an activity will be transitioned
	* to the stopped state if it is started while the lockscreen is up, but with this flag set the		* to the stopped state if it is started while the lockscreen is up, but with this flag set the
	* activity will remain in the resumed state visible on-top of the lock screen. This value can		* activity will remain in the resumed state visible on-top of the lock screen. This value can

Original line number	Original line	Diff line number	Diff line
	@@ -2247,7 +2247,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
	}		}

	/**		/**
	* Sets whether the the exit transition and enter transition overlap or not.		* Sets whether the exit transition and enter transition overlap or not.
	* When true, the enter transition will start as soon as possible. When false, the		* When true, the enter transition will start as soon as possible. When false, the
	* enter transition will wait until the exit transition completes before starting.		* enter transition will wait until the exit transition completes before starting.
	*		*
	@@ -2260,7 +2260,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
	}		}

	/**		/**
	* Returns whether the the exit transition and enter transition overlap or not.		* Returns whether the exit transition and enter transition overlap or not.
	* When true, the enter transition will start as soon as possible. When false, the		* When true, the enter transition will start as soon as possible. When false, the
	* enter transition will wait until the exit transition completes before starting.		* enter transition will wait until the exit transition completes before starting.
	*		*
	@@ -2274,7 +2274,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
	}		}

	/**		/**
	* Sets whether the the return transition and reenter transition overlap or not.		* Sets whether the return transition and reenter transition overlap or not.
	* When true, the reenter transition will start as soon as possible. When false, the		* When true, the reenter transition will start as soon as possible. When false, the
	* reenter transition will wait until the return transition completes before starting.		* reenter transition will wait until the return transition completes before starting.
	*		*
	@@ -2287,7 +2287,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
	}		}

	/**		/**
	* Returns whether the the return transition and reenter transition overlap or not.		* Returns whether the return transition and reenter transition overlap or not.
	* When true, the reenter transition will start as soon as possible. When false, the		* When true, the reenter transition will start as soon as possible. When false, the
	* reenter transition will wait until the return transition completes before starting.		* reenter transition will wait until the return transition completes before starting.
	*		*