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

Commit 81a9bece authored by Peter Ng's avatar Peter Ng Committed by Android (Google) Code Review
Browse files

Merge "copy and image updates to patterns and building blocks" into jb-dev

parents 47db02ba ce470e17
Loading
Loading
Loading
Loading
+22 −21
Original line number Diff line number Diff line
@@ -22,16 +22,17 @@ user to adjust settings or enter text.</p>
   settings. In other cases, such as alerts, the content may consist solely of text that provides
   further context for a user decision.</p>
  </li>

  <li>
  <h4>Action buttons</h4>
<p>Action buttons are typically Cancel and/or OK, with OK indicating the preferred or most likely
 action. However, if the options consist of specific actions such as Close or Wait rather than
 a confirmation or cancellation of the action described in the content, then all the buttons
 should be active verbs. As a rule, the dismissive action of a dialog is always on the left
 whereas the affirmative actions are on the right.</p>
  <p>Action buttons are typically Cancel and/or OK, with OK indicating the preferred or most likely action. However, if the options consist of specific actions such as Close or Wait rather than a confirmation or cancellation of the action described in the content, then all the buttons should be active verbs. Order actions following these rules:</p>
    <ul>
    
    <li>The dismissive action of a dialog is always on the left. Dismissive actions return to the user to the previous state.</li>
    <li>The affirmative actions are on the right. Affirmative actions continue progress toward the user goal that triggered the dialog.</li>
    </ul>
  </li>
</ol>

</div>

<img src="{@docRoot}design/media/dialogs_examples.png">
+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ footer.hide=1
#text-overlay {
  position: absolute;
  left: 0;
  top: 472px;
  top: 520px;
  width: 450px;
}
</style>
+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ page.title=Tabs
<p>Tabs in the action bar make it easy to explore and switch between different views or functional
aspects of your app, or to browse categorized data sets.</p>

<p>For details on using gestures to move between tabs, see the <a href="{@docRoot}design/patterns/swipe-views.html">Swipe Views</a> pattern.</p>

<h2 id="scrollable">Scrollable Tabs</h2>

@@ -36,7 +37,7 @@ to the next/previous view, swipe left or right.</p>
<h2 id="fixed">Fixed Tabs</h2>


<p>Fixed tabs display all items concurrently. To navigate to a different view, touch the tab.</p>
<p>Fixed tabs display all items concurrently. To navigate to a different view, touch the tab, or swipe left or right.</p>

<img src="{@docRoot}design/media/tabs_standard.png">
<div class="figure-caption">
+23.7 KiB (162 KiB)
Loading image diff...
+338 B (2.8 KiB)
Loading image diff...
Loading