diff options
| -rw-r--r-- | core/java/android/content/Intent.java | 4 | ||||
| -rw-r--r-- | core/java/android/hardware/input/InputManager.java | 2 | ||||
| -rw-r--r-- | docs/html/guide/components/fundamentals.jd | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 234ac50e2109..86b00a61d479 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -115,7 +115,7 @@ import java.util.Set; * </li> * <li> <p><b>{@link #ACTION_VIEW} <i>tel:123</i></b> -- Display * the phone dialer with the given number filled in. Note how the - * VIEW action does what what is considered the most reasonable thing for + * VIEW action does what is considered the most reasonable thing for * a particular URI.</p> * </li> * <li> <p><b>{@link #ACTION_DIAL} <i>tel:123</i></b> -- Display @@ -358,7 +358,7 @@ import java.util.Set; * <category android:name="{@link #CATEGORY_DEFAULT android.intent.category.DEFAULT}" /> * <data android:mimeType="vnd.android.cursor.item/<i>vnd.google.note</i>" /> * </intent-filter></pre> - * <p>This filter describes the ability return to the caller a note selected by + * <p>This filter describes the ability to return to the caller a note selected by * the user without needing to know where it came from. The data type * <code>vnd.android.cursor.item/vnd.google.note</code> is a URI from which * a Cursor of exactly one (<code>vnd.android.cursor.item</code>) item can diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index 444f0201b448..d519ce82be32 100644 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -107,7 +107,7 @@ public final class InputManager { * </p><p> * The <code>android:name</code> attribute specifies an identifier by which * the keyboard layout will be known in the package. - * The <code>android:label</code> attributes specifies a human-readable descriptive + * The <code>android:label</code> attribute specifies a human-readable descriptive * label to describe the keyboard layout in the user interface, such as "English (US)". * The <code>android:keyboardLayout</code> attribute refers to a * <a href="http://source.android.com/tech/input/key-character-map-files.html"> diff --git a/docs/html/guide/components/fundamentals.jd b/docs/html/guide/components/fundamentals.jd index 80125ba4f07a..f1b30703f79c 100644 --- a/docs/html/guide/components/fundamentals.jd +++ b/docs/html/guide/components/fundamentals.jd @@ -298,7 +298,7 @@ app.</p> <p>In the <code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> element, the {@code android:name} attribute specifies the fully qualified class name of the {@link -android.app.Activity} subclass and the {@code android:label} attributes specifies a string +android.app.Activity} subclass and the {@code android:label} attribute specifies a string to use as the user-visible label for the activity.</p> <p>You must declare all app components this way:</p> |