summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-06-30 19:45:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-30 19:45:03 +0000
commit88c2d704c3bbb58a676b4b1164b1c98aecdf467d (patch)
treeda7ebbaf42e31deb8f3a84549b9f6146490f6426
parent853c61788387c38c1103f26b1c8c028da5676776 (diff)
parent4bd25634f13876e7ab31b6de66ceb9ca1cdc784d (diff)
downloadframeworks_base-88c2d704c3bbb58a676b4b1164b1c98aecdf467d.zip
frameworks_base-88c2d704c3bbb58a676b4b1164b1c98aecdf467d.tar.gz
frameworks_base-88c2d704c3bbb58a676b4b1164b1c98aecdf467d.tar.bz2
am 4bd25634: am 765255b4: am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs
* commit '4bd25634f13876e7ab31b6de66ceb9ca1cdc784d': Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
-rw-r--r--docs/html/guide/topics/ui/controls/text.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/guide/topics/ui/controls/text.jd b/docs/html/guide/topics/ui/controls/text.jd
index 9474dee..c11dc32 100644
--- a/docs/html/guide/topics/ui/controls/text.jd
+++ b/docs/html/guide/topics/ui/controls/text.jd
@@ -172,7 +172,7 @@ android:imeOptions}</a> attribute. For example, here's how you can specify the S
are any subsequent <a
href="{@docRoot}reference/android/view/View.html#attr_android:focusable">{@code
android:focusable}</a> fields. If any focusable fields are found following this one, the system
-applies the (@code actionNext} action to the current {@link android.widget.EditText} so the user can
+applies the {@code "actionNext"} action to the current {@link android.widget.EditText} so the user can
select Next to move to the next field. If there's no subsequent focusable field, the system applies
the {@code "actionDone"} action. You can override this by setting the <a
href="{@docRoot}reference/android/widget/TextView.html#attr_android:imeOptions">{@code
@@ -263,7 +263,7 @@ disabled with {@code android:imeOptions="flagNoExtractUi"}.</p>
<p>If you want to provide suggestions to users as they type, you can use a subclass of {@link
android.widget.EditText} called {@link android.widget.AutoCompleteTextView}. To implement
-auto-complete, you must specify an (@link android.widget.Adapter) that provides the text
+auto-complete, you must specify an {@link android.widget.Adapter} that provides the text
suggestions. There are several kinds of adapters available, depending on where the data is coming
from, such as from a database or an array.</p>