Skip to content

Commit 8f8a11b

Browse files
committed
Fix some documentation typos.
Change-Id: I747a0ade5c7b9c45d4465bf327952338bbc1cfaa (cherry picked from commit 4465d1a)
1 parent d146224 commit 8f8a11b

9 files changed

Lines changed: 18 additions & 18 deletions

File tree

core/java/android/content/ClipData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
* can use the convenience method {@link Item#coerceToText Item.coerceToText}.
7979
* In this case there is generally no need to worry about the MIME types
8080
* reported by {@link ClipDescription#getMimeType(int) getDescription().getMimeType(int)},
81-
* since any clip item an always be converted to a string.
81+
* since any clip item can always be converted to a string.
8282
*
8383
* <p>More complicated exchanges will be done through URIs, in particular
8484
* "content:" URIs. A content URI allows the recipient of a ClippedData item

core/java/android/content/UriMatcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ private UriMatcher()
150150
* numbers.
151151
* <p>
152152
* Starting from API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2},
153-
* this method will accept leading slash in the path.
153+
* this method will accept a leading slash in the path.
154154
*
155155
* @param authority the authority to match
156156
* @param path the path to match. * may be used as a wild card for

core/java/android/net/Uri.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,15 @@ public boolean isOpaque() {
151151
}
152152

153153
/**
154-
* Returns true if this URI is relative, i.e. if it doesn't contain an
154+
* Returns true if this URI is relative, i.e.&nbsp;if it doesn't contain an
155155
* explicit scheme.
156156
*
157157
* @return true if this URI is relative, false if it's absolute
158158
*/
159159
public abstract boolean isRelative();
160160

161161
/**
162-
* Returns true if this URI is absolute, i.e. if it contains an
162+
* Returns true if this URI is absolute, i.e.&nbsp;if it contains an
163163
* explicit scheme.
164164
*
165165
* @return true if this URI is absolute, false if it's relative
@@ -176,8 +176,8 @@ public boolean isAbsolute() {
176176
public abstract String getScheme();
177177

178178
/**
179-
* Gets the scheme-specific part of this URI, i.e. everything between the
180-
* scheme separator ':' and the fragment separator '#'. If this is a
179+
* Gets the scheme-specific part of this URI, i.e.&nbsp;everything between
180+
* the scheme separator ':' and the fragment separator '#'. If this is a
181181
* relative URI, this method returns the entire URI. Decodes escaped octets.
182182
*
183183
* <p>Example: "//www.google.com/search?q=android"
@@ -187,8 +187,8 @@ public boolean isAbsolute() {
187187
public abstract String getSchemeSpecificPart();
188188

189189
/**
190-
* Gets the scheme-specific part of this URI, i.e. everything between the
191-
* scheme separator ':' and the fragment separator '#'. If this is a
190+
* Gets the scheme-specific part of this URI, i.e.&nbsp;everything between
191+
* the scheme separator ':' and the fragment separator '#'. If this is a
192192
* relative URI, this method returns the entire URI. Leaves escaped octets
193193
* intact.
194194
*

core/java/android/text/method/KeyListener.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,23 @@ public interface KeyListener {
5757

5858
/**
5959
* If the key listener wants to handle this key, return true,
60-
* otherwise return false and the caller (i.e. the widget host)
60+
* otherwise return false and the caller (i.e.&nbsp;the widget host)
6161
* will handle the key.
6262
*/
6363
public boolean onKeyDown(View view, Editable text,
6464
int keyCode, KeyEvent event);
6565

6666
/**
6767
* If the key listener wants to handle this key release, return true,
68-
* otherwise return false and the caller (i.e. the widget host)
68+
* otherwise return false and the caller (i.e.&nbsp;the widget host)
6969
* will handle the key.
7070
*/
7171
public boolean onKeyUp(View view, Editable text,
7272
int keyCode, KeyEvent event);
7373

7474
/**
7575
* If the key listener wants to other kinds of key events, return true,
76-
* otherwise return false and the caller (i.e. the widget host)
76+
* otherwise return false and the caller (i.e.&nbsp;the widget host)
7777
* will handle the key.
7878
*/
7979
public boolean onKeyOther(View view, Editable text, KeyEvent event);

core/java/android/view/View.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5033,7 +5033,7 @@ public boolean requestRectangleOnScreen(Rect rectangle, boolean immediate) {
50335033
* <strong>Note:</strong> When a View clears focus the framework is trying
50345034
* to give focus to the first focusable View from the top. Hence, if this
50355035
* View is the first from the top that can take focus, then all callbacks
5036-
* related to clearing focus will be invoked after wich the framework will
5036+
* related to clearing focus will be invoked after which the framework will
50375037
* give focus to this view.
50385038
* </p>
50395039
*/
@@ -6379,7 +6379,7 @@ public boolean isShown() {
63796379
* @see #setFitsSystemWindows(boolean)
63806380
* @see #setSystemUiVisibility(int)
63816381
*
6382-
* @deprecated As of API XX use {@link #dispatchApplyWindowInsets(WindowInsets)} to apply
6382+
* @deprecated As of API 20 use {@link #dispatchApplyWindowInsets(WindowInsets)} to apply
63836383
* insets to views. Views should override {@link #onApplyWindowInsets(WindowInsets)} or use
63846384
* {@link #setOnApplyWindowInsetsListener(android.view.View.OnApplyWindowInsetsListener)}
63856385
* to implement handling their own insets.

core/java/android/view/inputmethod/InputConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
* behavior you should adopt for a particular call, please mimic the
7676
* default TextView implementation in the latest Android version, and
7777
* if you decide to drift from it, please consider carefully that
78-
* inconsistencies in text edition behavior is almost universally felt
78+
* inconsistencies in text editor behavior is almost universally felt
7979
* as a bad thing by users.</p>
8080
*
8181
* <h3>Cursors, selections and compositions</h3>

core/java/android/widget/RelativeLayout.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@ public void addRule(int verb) {
14031403
* {@link android.widget.RelativeLayout RelativeLayout}, such as
14041404
* ALIGN_WITH_PARENT_LEFT.
14051405
* @param anchor The id of another view to use as an anchor,
1406-
* or a boolean value(represented as {@link RelativeLayout#TRUE})
1406+
* or a boolean value (represented as {@link RelativeLayout#TRUE}
14071407
* for true or 0 for false). For verbs that don't refer to another sibling
14081408
* (for example, ALIGN_WITH_PARENT_BOTTOM) just use -1.
14091409
* @see #addRule(int)

core/java/android/widget/TextView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7378,8 +7378,8 @@ private void applySingleLine(boolean singleLine, boolean applyTransformation,
73787378
* to turn off ellipsizing.
73797379
*
73807380
* If {@link #setMaxLines} has been used to set two or more lines,
7381-
* {@link android.text.TextUtils.TruncateAt#END} and
7382-
* {@link android.text.TextUtils.TruncateAt#MARQUEE}* are only supported
7381+
* only {@link android.text.TextUtils.TruncateAt#END} and
7382+
* {@link android.text.TextUtils.TruncateAt#MARQUEE} are supported
73837383
* (other ellipsizing types will not do anything).
73847384
*
73857385
* @attr ref android.R.styleable#TextView_ellipsize

docs/html/guide/topics/resources/drawable-resource.jd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ android:drawable="@color/green"}).</p>
6767

6868
<h2 id="Bitmap">Bitmap</h2>
6969

70-
<p>A bitmap image. Android supports bitmap files in a three formats:
70+
<p>A bitmap image. Android supports bitmap files in three formats:
7171
{@code .png} (preferred), {@code .jpg} (acceptable), {@code .gif} (discouraged).</p>
7272

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

0 commit comments

Comments
 (0)