summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics/ui/actionbar.jd
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/guide/topics/ui/actionbar.jd')
-rw-r--r--docs/html/guide/topics/ui/actionbar.jd24
1 files changed, 20 insertions, 4 deletions
diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd
index 3c0ef26..b83bde7 100644
--- a/docs/html/guide/topics/ui/actionbar.jd
+++ b/docs/html/guide/topics/ui/actionbar.jd
@@ -73,8 +73,10 @@ href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/inde
API Demos</a></li>
</ol>
- <h2>See also</h2>item
+ <h2>See also</h2>
<ol>
+ <li><a
+href="{@docRoot}design/patterns/actionbar.html">Android Design: Action Bar</a></li>
<li><a href="{@docRoot}guide/topics/ui/menus.html">Menus</a></li>
<li><a href="{@docRoot}guide/practices/tablets-and-handsets.html">Supporting Tablets
and Handsets</a></li>
@@ -124,6 +126,14 @@ landscape handset), showing the logo on the left, navigation tabs, and an action
right (plus the overflow menu button).</p>
+<div class="design-announce">
+<p><strong>Action Bar Design</strong></p>
+ <p>For design guidelines, read Android Design's <a
+href="{@docRoot}design/patterns/actionbar.html">Action Bar</a> guide.</p>
+</div>
+
+
+
<div class="sidebox-wrapper">
<div class="sidebox">
<h2>Remaining backward-compatible</h2>
@@ -536,6 +546,12 @@ the email application, but presses the action bar icon to navigate up, rather th
<p class="img-caption"><strong>Figure 6.</strong> Example behavior for UP navigation after
entering the Email app from the People app.</p>
+<div class="design-announce">
+<p><strong>Navigation Design</strong></p>
+ <p>For more about how <em>Up</em> and <em>Back</em> navigation differ, read Android Design's <a
+href="{@docRoot}design/patterns/navigation.html">Navigation</a> guide.</p>
+</div>
+
<p>To enable the icon for up navigation (which displays the "up" indicator next to the icon), call
{@link android.app.ActionBar#setDisplayHomeAsUpEnabled setDisplayHomeAsUpEnabled(true)} on your
{@link android.app.ActionBar}:</p>
@@ -642,7 +658,7 @@ work as designed otherwise.</p>
<p>Adding this value requires that you set your build target to Android 4.0 or higher in order to
compile. Older versions of Android ignore the {@code "collapseActionView"} value because they don't
understand it. Just be sure not to use other APIs in your source code that are not supported in the
-version declared by your <a href="{@docRoot}guide/topics/manifest/uses-sdk-elementl.html#min">{@code
+version declared by your <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code
minSdkVersion}</a>, unless you add the appropriate version check at runtime.</p>
</div>
</div>
@@ -843,8 +859,8 @@ you <em>do not</em> need to handle click events from the {@link
android.app.Activity#onOptionsItemSelected onOptionsItemSelected()} callback method.</p>
<p>For a sample using the share action provider, see
-<a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/ActionBarActionProviderActivity.html"
->ActionBarActionProviderActivity</a>.
+<a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/ActionBarShareActionProviderActivity.html"
+>ActionBarShareActionProviderActivity</a>.