Merge "Fix some documentation typos." into lmp-dev (d84ce32b) · Commits · e / os / android_frameworks_base

core/java/android/content/ClipData.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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.
		*
		* <p>More complicated exchanges will be done through URIs, in particular
		* "content:" URIs. A content URI allows the recipient of a ClippedData item

core/java/android/content/UriMatcher.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ public class UriMatcher
		* numbers.
		* <p>
		* 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

core/java/android/net/Uri.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
		}

		/**
		* 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<Uri> {
		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<Uri> {
		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.
		*
		* <p>Example: "//www.google.com/search?q=android"
		@@ -187,8 +187,8 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
		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.
		*

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);

core/java/android/view/View.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -5033,7 +5033,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		* <strong>Note:</strong> 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.
		* </p>
		*/
		@@ -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.