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

Commit 3cc4ee6c authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions 

* commit '5e095939':
  docs: update menu guide with CAB and popup menu, plus many other revisions
parents 763f1e13 5e095939

core/java/android/view/ActionMode.java

+9 −3
Original line number Original line Diff line number Diff line
@@ -18,9 +18,15 @@ package android.view; 








/**

/**

 * Represents a contextual mode of the user interface. Action modes can be used for

 * Represents a contextual mode of the user interface. Action modes can be used to provide

 * modal interactions with content and replace parts of the normal UI until finished.

 * alternative interaction modes and replace parts of the normal UI until finished.

 * Examples of good action modes include selection modes, search, content editing, etc.

 * Examples of good action modes include text selection and contextual actions.

 * <div class="special reference">

 * <h3>Developer Guides</h3>

 * <p>For information about how to provide contextual actions with {@code ActionMode},

 * read the <a href="{@docRoot}guide/topics/ui/menu.html#context-menu">Menus</a>

 * developer guide.</p>

 * </div>

 */

 */

public abstract class ActionMode {

public abstract class ActionMode {

    private Object mTag;

    private Object mTag;

docs/html/guide/guide_toc.cs

+1 −1
Original line number Original line Diff line number Diff line
@@ -131,7 +131,7 @@ 
              </a></li>

              </a></li>

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

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

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

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

              </a></li>

              </a> <span class="new">updated</span></li>

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

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

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

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

              </a></li>

              </a></li>

docs/html/guide/topics/ui/actionbar.jd

+10 −4
Original line number Original line Diff line number Diff line
@@ -113,9 +113,10 @@ accessible to the user in a predictable way. 
href="{@docRoot}guide/topics/ui/menus.html#OptionsMenu">options menu</a> directly in the action bar,

href="{@docRoot}guide/topics/ui/menus.html#OptionsMenu">options menu</a> directly in the action bar,

as "action items." Action items can also provide an "action view," which provides an embedded

as "action items." Action items can also provide an "action view," which provides an embedded

widget for even more immediate action behaviors. Menu items that are not promoted

widget for even more immediate action behaviors. Menu items that are not promoted

to an action item are available in the overflow menu, revealed by either the device MENU button

to an action item are available in the overflow menu, revealed by either the device <em>Menu</em>

button

(when available) or by an "overflow menu" button in the action bar (when the device does not

(when available) or by an "overflow menu" button in the action bar (when the device does not

include a MENU button).</p>

include a <em>Menu</em> button).</p>

</li>

</li>

</ul>

</ul>
@@ -125,6 +126,10 @@ href="{@docRoot}resources/samples/HoneycombGallery/index.html">Honeycomb Gallery 
landscape handset), showing the logo on the left, navigation tabs, and an action item on the

landscape handset), showing the logo on the left, navigation tabs, and an action item on the

right (plus the overflow menu button).</p>

right (plus the overflow menu button).</p>





<p class="note"><strong>Note:</strong> If you're looking for information about the contextual

action bar for displaying contextual action items, see the <a

href="{@docRoot}guide/topics/ui/menus.html#context-menu">Menu</a> guide.</p>







<div class="design-announce">

<div class="design-announce">

<p><strong>Action Bar Design</strong></p>

<p><strong>Action Bar Design</strong></p>
@@ -225,9 +230,10 @@ later&mdash;calling {@link android.app.Activity#getActionBar()} will return null 
href="{@docRoot}guide/topics/ui/menus.html#OptionsMenu">options menu</a>. To do this, you can

href="{@docRoot}guide/topics/ui/menus.html#OptionsMenu">options menu</a>. To do this, you can

declare that the menu item should appear in the action bar as an "action item." An action item can

declare that the menu item should appear in the action bar as an "action item." An action item can

include an icon and/or a text title. If a menu item does not appear as an action item, then the

include an icon and/or a text title. If a menu item does not appear as an action item, then the

system places it in the overflow menu. The overflow menu is revealed either by the device MENU

system places it in the overflow menu. The overflow menu is revealed either by the device

<em>Menu</em>

button (if provided by the device) or an additional button in the action bar (if the device does not

button (if provided by the device) or an additional button in the action bar (if the device does not

provide the MENU button).</p>

provide the <em>Menu</em> button).</p>





<div class="figure" style="width:359px">

<div class="figure" style="width:359px">

  <img src="{@docRoot}images/ui/actionbar-item-withtext.png" height="57" alt="" />

  <img src="{@docRoot}images/ui/actionbar-item-withtext.png" height="57" alt="" />

docs/html/guide/topics/ui/menus.jd

+679 −329

File changed.

Preview size limit exceeded, changes collapsed.

docs/html/images/ui/menu-context.png

0 → 100644
+44.2 KiB
Loading image diff...