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

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

Merge "docs: remove gerunds from UI dev guides and resolve linkbacks"

parents 0535bfb2 b10b48f6

docs/html/guide/guide_toc.cs

+13 −13
Original line number Diff line number Diff line
@@ -101,41 +101,41 @@ 
          </a></div>

        <ul>

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

               <span class="en">Declaring Layout</span>

               <span class="en">XML Layouts</span>

              </a></li>

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

                <span class="en">Input Events</span>

              </a></li>

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

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

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

              </a></li>

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

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

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

              </a></li>

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

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

              </a></li>

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

                <span class="en">Handling UI Events</span>

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

              </a></li>

          <li class="toggle-list">

            <div><a href="<?cs var:toroot ?>guide/topics/ui/notifiers/index.html">

                <span class="en">Notifying the User</span>

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

            </a></div>

            <ul>

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

                <span class="en">Creating Toast Notifications</span>

                <span class="en">Toast Notifications</span>

              </a></li>

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

                <span class="en">Creating Status Bar Notifications</span>

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

              </a></li>

            </ul>

          </li>

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

                <span class="en">Dragging and Dropping</span>

                <span class="en">Drag and Drop</span>

              </a></li>

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

                <span class="en">Applying Styles and Themes</span>

                <span class="en">Styles and Themes</span>

              </a></li>

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

                <span class="en">Building Custom Components</span>

                <span class="en">Custom Components</span>

              </a></li>

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

                <span class="en">Binding to Data with AdapterView</span>

docs/html/guide/practices/design/seamlessness.jd

+1 −1
Original line number Diff line number Diff line
@@ -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>

docs/html/guide/practices/ui_guidelines/menu_design.jd

+2 −2
Original line number Diff line number Diff line
@@ -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>

docs/html/guide/topics/appwidgets/index.jd

+1 −2
Original line number Diff line number Diff line
@@ -297,8 +297,7 @@ Guidelines</a>.</p> 


<p>Creating the App Widget layout is simple if you're

familiar with <a

href="{@docRoot}guide/topics/ui/declaring-layout.html">Declaring Layout in

XML</a>.

href="{@docRoot}guide/topics/ui/declaring-layout.html">XML Layouts</a>.

However, you must be aware that App Widget layouts are based on {@link

android.widget.RemoteViews},

which do not support every kind of layout or view widget.</p>

docs/html/guide/topics/fundamentals/fragments.jd

+3 −2
Original line number Diff line number Diff line
@@ -631,8 +631,9 @@ selects a menu item. If the activity's implementation of the on-item-selected ca 
handle the selected item, then the event is passed to the fragment's callback. This is true for

the Options Menu and context menus.</p>



<p>For more information about menus, see <a href="{@docRoot}guide/topics/ui/menus.html">Creating

Menus</a> and <a href="{@docRoot}guide/topics/ui/actionbar.html">Using the Action Bar</a>.</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>