Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "docs: fixing errors found with lint check" into pi-dev am: 8c7d2142f6

Browse Source 
am: 4d12f4c42b

Change-Id: I96a6dab05b6d4ea40950fe2ddc0948adf1b4e48f
This commit is contained in:
kopriva
2018-10-09 13:29:04 -07:00
committed by android-build-merger
parent 1e7b9347d7 4d12f4c42b
commit c997fc62e0
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/accounts/AccountAuthenticatorActivity.java
View File

@@ -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.
* @param icicle the save instance data of this Activity, may be null
*/

6
core/java/android/animation/Keyframe.java
View File

@@ -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
* of time elapsed of the overall animation duration.
* @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.
*/
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
* of time elapsed of the overall animation duration.
* @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.
*/
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
* of time elapsed of the overall animation duration.
* @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.
*/
public static Keyframe ofObject(float fraction, Object value) {

6
core/java/android/app/Activity.java
View File

@@ -2952,7 +2952,7 @@ public class Activity extends ContextThemeWrapper
/**
* Use with {@link #setDefaultKeyMode} to specify that unhandled keystrokes
* 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.
*
@@ -3252,7 +3252,7 @@ public class Activity extends ContextThemeWrapper
* interacted with the device in some way while your activity is running.
* This callback and {@link #onUserLeaveHint} are intended to help
* 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
* be accompanied by calls to {@link #onUserInteraction}. This
@@ -7906,7 +7906,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
* 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

2
core/java/android/app/ActivityOptions.java
View File

@@ -1501,7 +1501,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
* the extras {@link #EXTRA_USAGE_TIME_REPORT} and {@link #EXTRA_USAGE_TIME_REPORT_PACKAGES}
* filled in.

8
core/java/android/app/Fragment.java
View File

@@ -2259,7 +2259,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
* enter transition will wait until the exit transition completes before starting.
*
@@ -2272,7 +2272,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
* enter transition will wait until the exit transition completes before starting.
*
@@ -2286,7 +2286,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
* reenter transition will wait until the return transition completes before starting.
*
@@ -2299,7 +2299,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
* reenter transition will wait until the return transition completes before starting.
*

2
core/java/android/app/KeyguardManager.java
View File

@@ -561,7 +561,7 @@ public class KeyguardManager {
* This will, if the keyguard is secure, bring up the unlock screen of
* the keyguard.
*
* @param callback Let's you know whether the operation was succesful and
* @param callback Lets you know whether the operation was successful and
* it is safe to launch anything that would normally be considered safe
* once the user has gotten past the keyguard.
*/

6
core/java/android/app/Notification.java
View File

@@ -6203,7 +6203,7 @@ public class Notification implements Parcelable
public abstract boolean areNotificationsVisiblyDifferent(Style other);
/**
* @return the the text that should be displayed in the statusBar when heads-upped.
* @return the text that should be displayed in the statusBar when heads-upped.
* If {@code null} is returned, the default implementation will be used.
*
* @hide
@@ -6690,7 +6690,7 @@ public class Notification implements Parcelable
}
/**
* @return the the text that should be displayed in the statusBar when heads upped.
* @return the text that should be displayed in the statusBar when heads upped.
* If {@code null} is returned, the default implementation will be used.
*
* @hide
@@ -7346,7 +7346,7 @@ public class Notification implements Parcelable
}
/**
* Get the the Uri pointing to the content of the message. Can be null, in which case
* Get the Uri pointing to the content of the message. Can be null, in which case
* {@see #getText()} is used.
*/
public Uri getDataUri() {

6
core/java/android/app/SearchManager.java
View File

@@ -169,7 +169,7 @@ public class SearchManager
* Intent extra data key: Use this key with Intent.ACTION_SEARCH and
* {@link android.content.Intent#getStringExtra content.Intent.getStringExtra()}
* to obtain the action message that was defined for a particular search action key and/or
* suggestion. It will be null if the search was launched by typing "enter", touched the the
* suggestion. It will be null if the search was launched by typing "enter", touching the
* "GO" button, or other means not involving any action key.
*/
public final static String ACTION_MSG = "action_msg";
@@ -404,7 +404,7 @@ public class SearchManager
* Column name for suggestions cursor. <i>Optional.</i> If your content is rentable, you
* should provide this column to specify the displayable string representation of the rental
* price of your content including the currency and the amount. If it's free, you should
* provide localized string to specify that it's free. This column can be ommitted if the
* provide localized string to specify that it's free. This column can be omitted if the
* content is not applicable to rent.
*/
public final static String SUGGEST_COLUMN_RENTAL_PRICE = "suggest_rental_price";
@@ -579,7 +579,7 @@ public class SearchManager
*
* @param initialQuery A search string can be pre-entered here, but this
* is typically null or empty.
* @param selectInitialQuery If true, the intial query will be preselected, which means that
* @param selectInitialQuery If true, the initial query will be preselected, which means that
* any further typing will replace it. This is useful for cases where an entire pre-formed
* query is being inserted. If false, the selection point will be placed at the end of the
* inserted query. This is useful when the inserted query is text that the user entered,

2
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -3399,7 +3399,7 @@ public class DevicePolicyManager {
* restrictions on the parent profile.
*
* @param admin The name of the admin component to check, or {@code null} to aggregate
* accross all participating admins.
* across all participating admins.
* @return The timeout in milliseconds or 0 if not configured for the provided admin.
*/
public long getRequiredStrongAuthTimeout(@Nullable ComponentName admin) {

6
core/java/android/app/assist/AssistStructure.java
View File

@@ -1002,7 +1002,7 @@ public class AssistStructure implements Parcelable {
}
/**
* Gets the the type of value that can be used to autofill the view contents.
* Gets the type of value that can be used to autofill the view contents.
*
* <p>It's only relevant when the {@link AssistStructure} is used for autofill purposes.
*
@@ -1028,7 +1028,7 @@ public class AssistStructure implements Parcelable {
}
/**
* Gets the the value of this view.
* Gets the value of this view.
*
* <p>It's only relevant when the {@link AssistStructure} is used for autofill purposes,
* not for assist purposes.
@@ -1350,7 +1350,7 @@ public class AssistStructure implements Parcelable {
}
/**
* Returns the the list of locales associated with this view.
* Returns the list of locales associated with this view.
*/
@Nullable public LocaleList getLocaleList() {
return mLocaleList;