summaryrefslogtreecommitdiffstats
path: root/docs/html/resources/faq
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-10-03 16:06:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-03 16:06:47 -0700
commitd87448f7a7b6e3b05dc7d4248f79f5a5285a7435 (patch)
treefc3d9d6e5ff4e4f40ce4d67c9a85d2bfc169bec6 /docs/html/resources/faq
parent0535bfb25480eba1df5a4ee9ce8930929d5add07 (diff)
parentb10b48f62d3cac684424e4181d4e8ec61f227e95 (diff)
downloadframeworks_base-d87448f7a7b6e3b05dc7d4248f79f5a5285a7435.zip
frameworks_base-d87448f7a7b6e3b05dc7d4248f79f5a5285a7435.tar.gz
frameworks_base-d87448f7a7b6e3b05dc7d4248f79f5a5285a7435.tar.bz2
Merge "docs: remove gerunds from UI dev guides and resolve linkbacks"
Diffstat (limited to 'docs/html/resources/faq')
-rw-r--r--docs/html/resources/faq/commontasks.jd5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/html/resources/faq/commontasks.jd b/docs/html/resources/faq/commontasks.jd
index b211db0..c72343a 100644
--- a/docs/html/resources/faq/commontasks.jd
+++ b/docs/html/resources/faq/commontasks.jd
@@ -268,7 +268,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data){
{@link android.app.Activity#finishActivity(int) Activity.finishActivity()}
on any screens that it opens to close them. </p>
<a name="listening" id="listening"></a><h2>Listening for Button Clicks</h2>
-<p>Button click and other UI event capturing are covered in <a href="{@docRoot}guide/topics/ui/ui-events.html">Handling UI Events</a> on the UI Design page.</p>
+<p>Button click and other UI event capturing are covered in <a
+href="{@docRoot}guide/topics/ui/ui-events.html">Input Events</a>.</p>
<a name="configurewindowproperties" id="configurewindowproperties"></a><h2>Configuring General Window Properties</h2>
<p>You can set a number of general window properties, such as whether to display
a title, whether the window is floating, and whether it displays an icon, by
@@ -543,7 +544,7 @@ focus to the notification before they can interact with it.</p>
which enables a dialog box with an embedded progress bar to send a &quot;I'm working
on it&quot; notification to the user. </p>
<a name="addmenuitems" id="addmenuitems"></a><h2>Adding Items to the Screen Menu</h2>
-<p>See <a href="{@docRoot}guide/topics/ui/menus.html">Creating Menus</a>.</p>
+<p>See <a href="{@docRoot}guide/topics/ui/menus.html">Menus</a>.</p>
<a name="webpage" id="webpage"></a><h2>Display a Web Page</h2>
<p>Use the {@link android.webkit.WebView webkit.WebView} object. </p>