From 8f8a11b7fa26e603519131001ab46596aa30ba1a Mon Sep 17 00:00:00 2001 From: Newton Allen Date: Tue, 26 Nov 2013 10:25:38 -0800 Subject: [PATCH] Fix some documentation typos. Change-Id: I747a0ade5c7b9c45d4465bf327952338bbc1cfaa (cherry picked from commit 4465d1a03ee5fddc5987c19fc36b0bb79e19572f) --- core/java/android/content/ClipData.java | 2 +- core/java/android/content/UriMatcher.java | 2 +- core/java/android/net/Uri.java | 12 ++++++------ core/java/android/text/method/KeyListener.java | 6 +++--- core/java/android/view/View.java | 4 ++-- .../android/view/inputmethod/InputConnection.java | 2 +- core/java/android/widget/RelativeLayout.java | 2 +- core/java/android/widget/TextView.java | 4 ++-- .../html/guide/topics/resources/drawable-resource.jd | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/core/java/android/content/ClipData.java b/core/java/android/content/ClipData.java index d19604b27936a..0cafff8b1a234 100644 --- a/core/java/android/content/ClipData.java +++ b/core/java/android/content/ClipData.java @@ -78,7 +78,7 @@ import java.util.ArrayList; * can use the convenience method {@link Item#coerceToText Item.coerceToText}. * In this case there is generally no need to worry about the MIME types * reported by {@link ClipDescription#getMimeType(int) getDescription().getMimeType(int)}, - * since any clip item an always be converted to a string. + * since any clip item can always be converted to a string. * *

More complicated exchanges will be done through URIs, in particular * "content:" URIs. A content URI allows the recipient of a ClippedData item diff --git a/core/java/android/content/UriMatcher.java b/core/java/android/content/UriMatcher.java index 1a8ea47ddfb50..8487dae4f7bf5 100644 --- a/core/java/android/content/UriMatcher.java +++ b/core/java/android/content/UriMatcher.java @@ -150,7 +150,7 @@ public class UriMatcher * numbers. *

* Starting from API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}, - * this method will accept leading slash in the path. + * this method will accept a leading slash in the path. * * @param authority the authority to match * @param path the path to match. * may be used as a wild card for diff --git a/core/java/android/net/Uri.java b/core/java/android/net/Uri.java index ce70455871ebf..2099c3f9b02f5 100644 --- a/core/java/android/net/Uri.java +++ b/core/java/android/net/Uri.java @@ -151,7 +151,7 @@ public abstract class Uri implements Parcelable, Comparable { } /** - * Returns true if this URI is relative, i.e. if it doesn't contain an + * Returns true if this URI is relative, i.e. if it doesn't contain an * explicit scheme. * * @return true if this URI is relative, false if it's absolute @@ -159,7 +159,7 @@ public abstract class Uri implements Parcelable, Comparable { public abstract boolean isRelative(); /** - * Returns true if this URI is absolute, i.e. if it contains an + * Returns true if this URI is absolute, i.e. if it contains an * explicit scheme. * * @return true if this URI is absolute, false if it's relative @@ -176,8 +176,8 @@ public abstract class Uri implements Parcelable, Comparable { public abstract String getScheme(); /** - * Gets the scheme-specific part of this URI, i.e. everything between the - * scheme separator ':' and the fragment separator '#'. If this is a + * Gets the scheme-specific part of this URI, i.e. everything between + * the scheme separator ':' and the fragment separator '#'. If this is a * relative URI, this method returns the entire URI. Decodes escaped octets. * *

Example: "//www.google.com/search?q=android" @@ -187,8 +187,8 @@ public abstract class Uri implements Parcelable, Comparable { public abstract String getSchemeSpecificPart(); /** - * Gets the scheme-specific part of this URI, i.e. everything between the - * scheme separator ':' and the fragment separator '#'. If this is a + * Gets the scheme-specific part of this URI, i.e. everything between + * the scheme separator ':' and the fragment separator '#'. If this is a * relative URI, this method returns the entire URI. Leaves escaped octets * intact. * diff --git a/core/java/android/text/method/KeyListener.java b/core/java/android/text/method/KeyListener.java index bb79ecdf8bf8e..ce7054c40d01b 100644 --- a/core/java/android/text/method/KeyListener.java +++ b/core/java/android/text/method/KeyListener.java @@ -57,7 +57,7 @@ public interface KeyListener { /** * If the key listener wants to handle this key, return true, - * otherwise return false and the caller (i.e. the widget host) + * otherwise return false and the caller (i.e. the widget host) * will handle the key. */ public boolean onKeyDown(View view, Editable text, @@ -65,7 +65,7 @@ public interface KeyListener { /** * If the key listener wants to handle this key release, return true, - * otherwise return false and the caller (i.e. the widget host) + * otherwise return false and the caller (i.e. the widget host) * will handle the key. */ public boolean onKeyUp(View view, Editable text, @@ -73,7 +73,7 @@ public interface KeyListener { /** * If the key listener wants to other kinds of key events, return true, - * otherwise return false and the caller (i.e. the widget host) + * otherwise return false and the caller (i.e. the widget host) * will handle the key. */ public boolean onKeyOther(View view, Editable text, KeyEvent event); diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 83dfe851bcd05..e0be18034c0b5 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5033,7 +5033,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * Note: When a View clears focus the framework is trying * to give focus to the first focusable View from the top. Hence, if this * View is the first from the top that can take focus, then all callbacks - * related to clearing focus will be invoked after wich the framework will + * related to clearing focus will be invoked after which the framework will * give focus to this view. *

*/ @@ -6379,7 +6379,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * @see #setFitsSystemWindows(boolean) * @see #setSystemUiVisibility(int) * - * @deprecated As of API XX use {@link #dispatchApplyWindowInsets(WindowInsets)} to apply + * @deprecated As of API 20 use {@link #dispatchApplyWindowInsets(WindowInsets)} to apply * insets to views. Views should override {@link #onApplyWindowInsets(WindowInsets)} or use * {@link #setOnApplyWindowInsetsListener(android.view.View.OnApplyWindowInsetsListener)} * to implement handling their own insets. diff --git a/core/java/android/view/inputmethod/InputConnection.java b/core/java/android/view/inputmethod/InputConnection.java index c51d8a71e9760..ff992d39fc667 100644 --- a/core/java/android/view/inputmethod/InputConnection.java +++ b/core/java/android/view/inputmethod/InputConnection.java @@ -75,7 +75,7 @@ import android.view.KeyEvent; * behavior you should adopt for a particular call, please mimic the * default TextView implementation in the latest Android version, and * if you decide to drift from it, please consider carefully that - * inconsistencies in text edition behavior is almost universally felt + * inconsistencies in text editor behavior is almost universally felt * as a bad thing by users.

* *

Cursors, selections and compositions

diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 23f911c94f433..5b604cd4590f6 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -1403,7 +1403,7 @@ public class RelativeLayout extends ViewGroup { * {@link android.widget.RelativeLayout RelativeLayout}, such as * ALIGN_WITH_PARENT_LEFT. * @param anchor The id of another view to use as an anchor, - * or a boolean value(represented as {@link RelativeLayout#TRUE}) + * or a boolean value (represented as {@link RelativeLayout#TRUE} * for true or 0 for false). For verbs that don't refer to another sibling * (for example, ALIGN_WITH_PARENT_BOTTOM) just use -1. * @see #addRule(int) diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index a80d70af5251c..5cdee53abb151 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -7378,8 +7378,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * to turn off ellipsizing. * * If {@link #setMaxLines} has been used to set two or more lines, - * {@link android.text.TextUtils.TruncateAt#END} and - * {@link android.text.TextUtils.TruncateAt#MARQUEE}* are only supported + * only {@link android.text.TextUtils.TruncateAt#END} and + * {@link android.text.TextUtils.TruncateAt#MARQUEE} are supported * (other ellipsizing types will not do anything). * * @attr ref android.R.styleable#TextView_ellipsize diff --git a/docs/html/guide/topics/resources/drawable-resource.jd b/docs/html/guide/topics/resources/drawable-resource.jd index dee28fe02d5c2..06bd2d07314b9 100644 --- a/docs/html/guide/topics/resources/drawable-resource.jd +++ b/docs/html/guide/topics/resources/drawable-resource.jd @@ -67,7 +67,7 @@ android:drawable="@color/green"}).

Bitmap

-

A bitmap image. Android supports bitmap files in a three formats: +

A bitmap image. Android supports bitmap files in three formats: {@code .png} (preferred), {@code .jpg} (acceptable), {@code .gif} (discouraged).

You can reference a bitmap file directly, using the filename as the resource ID, or create an