Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07aa83c9 authored by Andrew Solovay's avatar Andrew Solovay Committed by Android (Google) Code Review
Browse files

Merge "docs: Removed ActionBar API guide" into mnc-docs

parents 2dc7685c 7d6d7d96

docs/html/guide/components/fragments.jd

+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ parent.link=activities.html 
    <li><a href="#CommunicatingWithActivity">Communicating with the Activity</a>

      <ol>

        <li><a href="#EventCallbacks">Creating event callbacks to the activity</a></li>

        <li><a href="#ActionBar">Adding items to the Action Bar</a></li>

        <li><a href="#ActionBar">Adding items to the App Bar</a></li>

      </ol>

    </li>

    <li><a href="#Lifecycle">Handling the Fragment Lifecycle</a>
@@ -603,11 +603,11 @@ href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers 






<h3 id="ActionBar">Adding items to the Action Bar</h3>

<h3 id="ActionBar">Adding items to the App Bar</h3>



<p>Your fragments can contribute menu items to the activity's <a

href="{@docRoot}guide/topics/ui/menus.html#options-menu">Options Menu</a> (and, consequently, the <a

href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a>) by implementing

href="{@docRoot}training/appbar/index.html">app bar</a>) by implementing

{@link android.app.Fragment#onCreateOptionsMenu(Menu,MenuInflater) onCreateOptionsMenu()}. In order

for this method to receive calls, however, you must call {@link

android.app.Fragment#setHasOptionsMenu(boolean) setHasOptionsMenu()} during {@link
@@ -634,8 +634,8 @@ handle the selected item, then the event is passed to the fragment's callback. T 
the Options Menu and context menus.</p>



<p>For more information about menus, see the <a

href="{@docRoot}guide/topics/ui/menus.html">Menus</a> and <a

href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guides.</p>

href="{@docRoot}guide/topics/ui/menus.html">Menus</a> developer guide and the <a

href="{@docRoot}training/appbar/index.html">App Bar</a> training class.</p>

docs/html/guide/guide_toc.cs

+0 −3
Original line number Diff line number Diff line
@@ -262,9 +262,6 @@ 
      <li><a href="<?cs var:toroot ?>guide/topics/ui/menus.html">

          <span class="en">Menus</span></span>

          </a></li>

      <li><a href="<?cs var:toroot ?>guide/topics/ui/actionbar.html">

           <span class="en">Action Bar</span>

          </a></li>

      <li><a href="<?cs var:toroot ?>guide/topics/ui/settings.html">

            <span class="en">Settings</span>

          </a></li>

docs/html/guide/topics/manifest/activity-element.jd

+5 −4
Original line number Diff line number Diff line
@@ -982,16 +982,17 @@ href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a> developer gui 
    <tr><th>Value</th><th>Description</th></tr>

    <tr><td>{@code "none"}</td><td>No extra UI options. This is the default.</td></tr>

    <tr><td>{@code "splitActionBarWhenNarrow"}</td><td>Add a bar at

the bottom of the screen to display action items in the {@link android.app.ActionBar}, when

the bottom of the screen to display action items in the <em>app bar</em> (also known as the

<em>action bar</em>), when

constrained for horizontal space (such as when in portrait mode on a handset). Instead of a small

number of action items appearing in the action bar at the top of the screen, the action bar is

number of action items appearing in the app bar at the top of the screen, the app bar is

split into the top navigation section and the bottom bar for action items. This ensures a reasonable

amount of space is made available not only for the action items, but also for navigation and title

elements at the top. Menu items are not split across the two bars; they always appear

together.</td></tr>

  </table>

  <p>For more information about the action bar, see the <a

href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.</p>

  <p>For more information about the app bar, see the <a

href="{@docRoot}training/appbar/index.html">Adding the App Bar</a> training class.</p>

  <p>This attribute was added in API level 14.</p>

</dd>

docs/html/guide/topics/manifest/application-element.jd

+5 −4
Original line number Diff line number Diff line
@@ -434,16 +434,17 @@ href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a> developer gui 
    <tr><th>Value</th><th>Description</th></tr>

    <tr><td>{@code "none"}</td><td>No extra UI options. This is the default.</td></tr>

    <tr><td>{@code "splitActionBarWhenNarrow"}</td><td>Add a bar at

the bottom of the screen to display action items in the {@link android.app.ActionBar}, when

the bottom of the screen to display action items in the <em>app bar</em> (also known as the

<em>action bar</em>), when

constrained for horizontal space (such as when in portrait mode on a handset). Instead of a small

number of action items appearing in the action bar at the top of the screen, the action bar is

number of action items appearing in the app bar at the top of the screen, the app bar is

split into the top navigation section and the bottom bar for action items. This ensures a reasonable

amount of space is made available not only for the action items, but also for navigation and title

elements at the top. Menu items are not split across the two bars; they always appear

together.</td></tr>

  </table>

  <p>For more information about the action bar, see the <a

href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.</p>

  <p>For more information about the app bar, see the <a

href="{@docRoot}training/appbar/index.html">Adding the App Bar</a> training class.</p>

  <p>This attribute was added in API level 14.</p>

</dd>

docs/html/guide/topics/resources/menu-resource.jd

+15 −15
Original line number Diff line number Diff line
@@ -117,47 +117,47 @@ functionality.</p> 
          <p>Introduced in API Level 11.</p></dd>



        <dt><code>android:showAsAction</code></dt>

          <dd><em>Keyword</em>. When and how this item should appear as an action item in the Action

Bar. A menu item can appear as an action item only when the activity includes an {@link

android.app.ActionBar} (introduced in API Level 11). Valid values:

          <dd><em>Keyword</em>. When and how this item should appear as an action item in the app

            bar. A menu item can appear as an action item only when the activity includes an

            app bar. Valid values:

          <table>

            <tr><th>Value</th><th>Description</th></tr>

            <tr><td><code>ifRoom</code></td><td>Only place this item in the

            Action Bar if there is room for it. If there is not room for all

            app bar if there is room for it. If there is not room for all

            the items marked <code>"ifRoom"</code>, the items with the lowest

            <code>orderInCategory</code> values are displayed as actions, and

            the remaining items are displayed in the overflow menu.</td></tr>

            <tr><td><code>withText</code></td><td>Also include the title text (defined

by {@code android:title}) with the action item. You can include this value along with one

of the others as a flag set, by separating them with a pipe {@code |}.</td></tr>

            <tr><td><code>never</code></td><td>Never place this item in the Action Bar. Instead, list the item in the Action Bar's overflow

            <tr><td><code>never</code></td><td>Never place this item in the app bar. Instead, list the item in the app bar's overflow

            menu.</td></tr>

            <tr><td><code>always</code></td><td>Always place this item in the Action Bar.

            <tr><td><code>always</code></td><td>Always place this item in the app bar.

Avoid using this unless it's critical that the item always appear in the action

bar. Setting multiple items to always appear as action items can result in them overlapping

with other UI in the action bar.</td></tr>

with other UI in the app bar.</td></tr>

            <tr><td><code>collapseActionView</code></td><td>The action view associated

with this action item (as declared by <code>android:actionLayout</code> or

<code>android:actionViewClass</code>) is

collapsible.<br/>Introduced in API Level 14.</td></tr>

          </table>

          <p>See the <a href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer 

guide for more information.</p>

          <p>See the <a href="{@docRoot}training/appbar/index.html">Adding the App Bar</a>

          training class for more information.</p>

          <p>Introduced in API Level 11.</p>

        </dd>



        <dt><code>android:actionLayout</code></dt>

          <dd><em>Layout resource</em>. A layout to use as the action view.

          <p>See the <a href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer 

guide for more information.</p>

          <p>See <a href="{@docRoot}training/appbar/action-views.html">Action

            Views and Action Providers</a> for more information.</p>

          <p>Introduced in API Level 11.</p></dd>



        <dt><code>android:actionViewClass</code></dt>

          <dd><em>Class name</em>. A fully-qualified class name for the {@link android.view.View}

to use as the action view. For example,

{@code "android.widget.SearchView"} to use {@link android.widget.SearchView} as an action view.

          <p>See the <a href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer 

guide for more information.</p>

          <p>See <a href="{@docRoot}training/appbar/action-views.html">Action

            Views and Action Providers</a> for more information.</p>

          <p class="warning"><strong>Warning:</strong> If you obfuscate your code using <a

href="{@docRoot}tools/help/proguard.html">ProGuard</a> (or a similar tool),

be sure to exclude the class you specify in this attribute from renaming, because it can break the
@@ -168,8 +168,8 @@ functionality.</p> 
          <dd><em>Class name</em>. A fully-qualified class name for the {@link

android.view.ActionProvider} to use in place of the action item. For example,

{@code "android.widget.ShareActionProvider"} to use {@link android.widget.ShareActionProvider}.

          <p>See the <a href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer

guide for more information.</p>

          <p>See <a href="{@docRoot}training/appbar/action-views.html">Action

            Views and Action Providers</a> for more information.</p>

          <p class="warning"><strong>Warning:</strong> If you obfuscate your code using <a

href="{@docRoot}tools/help/proguard.html">ProGuard</a> (or a similar tool),

be sure to exclude the class you specify in this attribute from renaming, because it can break the