Skip to content

Commit 55ed7e3

Browse files
Peter NgAndroid Git Automerger
authored andcommitted
am 3e504ac: Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev
* commit '3e504ac71715a1b152494c9765f41d13bc605b75': Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed
2 parents ab0b9a9 + 3e504ac commit 55ed7e3

40 files changed

+349
-194
lines changed

docs/html/design/building-blocks/dialogs.jd

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,46 @@ available based on the title and the text of the action buttons.</p>
8181

8282
</div>
8383
</div>
84+
<p>When crafting a confirmation dialog, make the title meaningful by echoing the requested action.</p>
8485

86+
<div class="layout-content-row">
87+
<div class="layout-content-col span-4">
88+
<div class="do-dont-label bad">Don't</div>
89+
<table class="ui-table bad">
90+
<thead>
91+
<tr>
92+
<th class="label">
93+
Are you sure?
94+
</th>
95+
</tr>
96+
</thead>
97+
</table>
98+
</div>
99+
<div class="layout-content-col span-4">
100+
<div class="do-dont-label bad">Don't</div>
101+
<table class="ui-table bad">
102+
<thead>
103+
<tr>
104+
<th class="label">
105+
Warning!
106+
</th>
107+
</tr>
108+
</thead>
109+
</table>
110+
</div>
111+
<div class="layout-content-col span-5">
112+
<div class="do-dont-label good">Do</div>
113+
<table class="ui-table good">
114+
<thead>
115+
<tr>
116+
<th class="label">
117+
Erase USB storage?
118+
</th>
119+
</tr>
120+
</thead>
121+
</table>
122+
</div>
123+
</div>
85124

86125
<h2 id="popups">Popups</h2>
87126

docs/html/design/building-blocks/tabs.jd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ to the next/previous view, swipe left or right.</p>
3535

3636

3737
<h2 id="fixed">Fixed Tabs</h2>
38-
39-
4038
<p>Fixed tabs display all items concurrently. To navigate to a different view, touch the tab, or swipe left or right.</p>
39+
<p>Fixed tabs are displayed with equal width, based on the width of the widest tab label. If there is insufficient room to display all tabs, the tab labels themselves will be scrollable. For this reason, fixed tabs are best suited for displaying 3 or fewer tabs.</p>
4140

4241
<img src="{@docRoot}design/media/tabs_standard.png">
4342
<div class="figure-caption">

docs/html/design/design_toc.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@
3434
<li><a href="<?cs var:toroot ?>design/patterns/multi-pane-layouts.html">Multi-pane Layouts</a></li>
3535
<li><a href="<?cs var:toroot ?>design/patterns/swipe-views.html">Swipe Views</a></li>
3636
<li><a href="<?cs var:toroot ?>design/patterns/selection.html">Selection</a></li>
37+
<li><a href="<?cs var:toroot ?>design/patterns/confirming-acknowledging.html">Confirming &amp; Acknowledging</a></li>
3738
<li><a href="<?cs var:toroot ?>design/patterns/notifications.html">Notifications</a></li>
39+
<li><a href="<?cs var:toroot ?>design/patterns/widgets.html">Widgets</a></li>
3840
<li><a href="<?cs var:toroot ?>design/patterns/settings.html">Settings</a></li>
3941
<li><a href="<?cs var:toroot ?>design/patterns/help.html">Help</a></li>
4042
<li><a href="<?cs var:toroot ?>design/patterns/compatibility.html">Compatibility</a></li>
4143
<li><a href="<?cs var:toroot ?>design/patterns/accessibility.html">Accessibility</a></li>
4244
<li><a href="<?cs var:toroot ?>design/patterns/pure-android.html">Pure Android</a></li>
43-
<li><a href="<?cs var:toroot ?>design/patterns/confirming-acknowledging.html">Confirming &amp; Acknowledging</a></li>
4445
</ul>
4546
</li>
4647

@@ -67,7 +68,7 @@
6768
</li>
6869

6970
<li class="nav-section">
70-
<div class="nav-section-header empty"><a href="<?cs var:toroot ?>design/extras/index.html">Extras</a></div>
71+
<div class="nav-section-header empty"><a href="<?cs var:toroot ?>design/videos/index.html">Videos</a></div>
7172
</li>
7273

7374
</ul>

docs/html/design/extras/index.jd

Lines changed: 0 additions & 22 deletions
This file was deleted.

docs/html/design/get-started/creative-vision.jd

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@ page.title=Creative Vision
55

66
<div class="vspace size-1">&nbsp;</div>
77

8-
<p>Ice Cream Sandwich (Android 4.0) marks a major milestone for Android design. We touched nearly every
9-
pixel of the system as we expanded the new design approaches introduced in Honeycomb tablets to all
10-
types of mobile devices. Starting with the most basic elements, we introduced a new font, Roboto,
11-
designed for high-resolution displays. Other big changes include framework-level action bars on
12-
phones and support for new phones without physical buttons.</p>
13-
<p>We focused the design work with three overarching goals for our core apps and the system at large.
14-
As you design apps to work with Android, consider these goals:</p>
8+
<p>We focused the design of Android around three overarching goals, which apply to our core apps as well as the system at large. As you design apps to work with Android, consider these goals:</p>
159

1610
<div class="vspace size-1">&nbsp;</div>
1711

docs/html/design/get-started/ui-overview.jd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ notification opens the associated app. <a href="{@docRoot}design/patterns/notifi
101101

102102
<img src="{@docRoot}design/media/notifications_dismiss.png">
103103

104-
<p>Most notifications have a one-line title and a one-line message. The recommended layout for a
105-
notification includes two lines. If necessary, you can add a third line. Timestamps are optional.</p>
104+
<p>Notifications can be expanded to uncover more details and relevant actions. When collapsed, notifications have a one-line title and a one-line message.The recommended layout for a notification includes two lines. If necessary, you can add a third line.</p>
106105
<p>Swiping a notification right or left removes it from the notification drawer.</p>
107106

108107
</div>
-2.25 KB
Loading
-124 KB
Loading
3.05 KB
Loading
3.93 KB
Loading

0 commit comments

Comments
 (0)