summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/practices
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/guide/practices
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/guide/practices')
-rw-r--r--docs/html/guide/practices/design/seamlessness.jd2
-rw-r--r--docs/html/guide/practices/ui_guidelines/menu_design.jd4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/practices/design/seamlessness.jd b/docs/html/guide/practices/design/seamlessness.jd
index dedc16f..6c73426 100644
--- a/docs/html/guide/practices/design/seamlessness.jd
+++ b/docs/html/guide/practices/design/seamlessness.jd
@@ -171,7 +171,7 @@ interface they've come to expect. When designing your UIs, you should try and
avoid rolling your own as much as possible. Instead, use a Theme. You
can override or extend those parts of the theme that you need to, but at least
you're starting from the same UI base as all the other applications. For all
-the details, read <a href="{@docRoot}guide/topics/ui/themes.html">Applying Styles and Themes</a>.</p>
+the details, read <a href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a>.</p>
<h2 id="flexui">Design Your UI to Work with Multiple Screen Resolutions</h2>
diff --git a/docs/html/guide/practices/ui_guidelines/menu_design.jd b/docs/html/guide/practices/ui_guidelines/menu_design.jd
index 7751a7b..3edf33f 100644
--- a/docs/html/guide/practices/ui_guidelines/menu_design.jd
+++ b/docs/html/guide/practices/ui_guidelines/menu_design.jd
@@ -260,8 +260,8 @@ or device to another.
<img src={@docRoot}images/menu_design/TaskFlowDiagram.png>
<p>
- For more technical information on menus, see
- <a href="{@docRoot}guide/topics/ui/menus.html">Creating Menus</a>.
+ For more technical information on menus, see the
+ <a href="{@docRoot}guide/topics/ui/menus.html">Menus</a> developer guide.
</p>
<h3 id="commands_fixed">Commands Fixed in an Activity Screen</h4>