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

Commit 08d40d71 authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "docs: Big update to action bar guide for ICS. Added section for action... 

Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917" into ics-mr0
parents 69e24843 258a51e3

docs/html/guide/guide_toc.cs

+13 −13
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 
              </a></li>

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

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

              </a></li>

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

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

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

              </a></li>
@@ -739,21 +739,21 @@ applications</span> 
        <ul>

          <li class="toggle-list">

            <div><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design.html">

                   <span class="en">Icon Design <span class="new">updated</span></span>

                 </a></div>

                   <span class="en">Icon Design</span>

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

            <ul>

              <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_launcher.html">

                    <span class="en">Launcher Icons <span class="new">updated</span></span>

                  </a></li>

                    <span class="en">Launcher Icons</span>

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

              <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_menu.html">

                    <span class="en">Menu Icons</span>

                  </a></li>

              <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_action_bar.html">

                    <span class="en">Action Bar Icons <span class="new">new!</span></span>

                  </a></li>

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

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

              <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_status_bar.html">

                    <span class="en">Status Bar Icons <span class="new">updated</span></span>

                  </a></li>

                    <span class="en">Status Bar Icons</span>

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

              <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design_tab.html">

                    <span class="en">Tab Icons</span>

                  </a></li>
@@ -766,8 +766,8 @@ applications</span> 
            </ul>

          </li>

          <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/widget_design.html">

                <span class="en">App Widget Design <span class="new">updated</span></span>

              </a></li>

                <span class="en">App Widget Design</span>

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

          <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/activity_task_design.html">

                <span class="en">Activity and Task Design</span>

              </a></li>
@@ -844,8 +844,8 @@ applications</span> 
            <span class="en">App Install Location</span>

          </a></li>

      <li><a href="<?cs var:toroot ?>guide/appendix/media-formats.html">

            <span class="en">Supported Media Formats <span class="new">updated</span></span>

          </a></li>

            <span class="en">Supported Media Formats</span>

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

      <li><a href="<?cs var:toroot ?>guide/appendix/g-app-intents.html">

            <span class="en">Intents List: Google Apps</span>

          </a></li>

docs/html/guide/practices/tablets-and-handsets.jd

+2 −3
Original line number Diff line number Diff line
@@ -372,9 +372,8 @@ tips to follow when creating your action bar:</p> 
value</strong>. In your <a

href="{@docRoot}guide/topics/resources/menu-resource.html">menu resource</a>, use {@code "ifRoom"}

for the {@code android:showAsAction} attribute if you'd like the menu item to appear in the action

bar. However, you might need {@code "always"} when an action view does not provide an alternative

action for the overflow menu (that is, it must appear as an action view) or when a menu item added

by a fragment is low in the menu order and it must jump into the action bar at all times. However,

bar. However, you might need {@code "always"} when an action view does not provide a default

action for the overflow menu (that is, it must appear as an action view). However,

you should not use {@code "always"} more than once or twice. In almost all other cases, use {@code

"ifRoom"} as the value for {@code "android:showAsAction"} when you want the item to appear as an

action item. Forcing too many action items into the action bar can create a cluttered UI and

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

+1042 −427

File changed.

Preview size limit exceeded, changes collapsed.

docs/html/images/ui/actionbar-actionview.png

+3.15 KiB (7.26 KiB)
Loading image diff...

docs/html/images/ui/actionbar-item-withtext.png

+4.36 KiB (10.5 KiB)
Loading image diff...