Skip to content

Commit a9a3c25

Browse files
scottamainAndroid Git Automerger
authored andcommitted
am c950641: Group revert of the following commits for design docs:
* commit 'c9506415d533c61a9607c5b61a1993747bafb406': Group revert of the following commits for design docs:
2 parents 7bf1831 + c950641 commit a9a3c25

File tree

75 files changed

+279
-723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+279
-723
lines changed

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

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,28 @@ user to adjust settings or enter text.</p>
1010
<div class="with-callouts">
1111

1212
<ol>
13-
<li>
14-
<h4>Optional title region</h4>
15-
<p>The title introduces the content of your dialog. It can, for example, identify the name of a
16-
setting that the user is about to change, or request a decision.</p>
17-
</li>
18-
<li>
19-
<h4>Content area</h4>
20-
<p>Dialog content varies widely. For settings dialogs, a dialog may contain UI elements such as
21-
sliders, text fields, checkboxes, or radio buttons that allow the user to change app or system
22-
settings. In other cases, such as alerts, the content may consist solely of text that provides
23-
further context for a user decision.</p>
24-
</li>
25-
26-
<li>
27-
<h4>Action buttons</h4>
28-
<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>
29-
<ul>
30-
31-
<li>The dismissive action of a dialog is always on the left. Dismissive actions return to the user to the previous state.</li>
32-
<li>The affirmative actions are on the right. Affirmative actions continue progress toward the user goal that triggered the dialog.</li>
33-
</ul>
34-
</li>
13+
<li>
14+
<h4>Optional title region</h4>
15+
<p>The title introduces the content of your dialog. It can, for example, identify the name of a
16+
setting that the user is about to change, or request a decision.</p>
17+
</li>
18+
<li>
19+
<h4>Content area</h4>
20+
<p>Dialog content varies widely. For settings dialogs, a dialog may contain UI elements such as
21+
sliders, text fields, checkboxes, or radio buttons that allow the user to change app or system
22+
settings. In other cases, such as alerts, the content may consist solely of text that provides
23+
further context for a user decision.</p>
24+
</li>
25+
<li>
26+
<h4>Action buttons</h4>
27+
<p>Action buttons are typically Cancel and/or OK, with OK indicating the preferred or most likely
28+
action. However, if the options consist of specific actions such as Close or Wait rather than
29+
a confirmation or cancellation of the action described in the content, then all the buttons
30+
should be active verbs. As a rule, the dismissive action of a dialog is always on the left
31+
whereas the affirmative actions are on the right.</p>
32+
</li>
3533
</ol>
34+
3635
</div>
3736

3837
<img src="{@docRoot}design/media/dialogs_examples.png">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ footer.hide=1
1111
#text-overlay {
1212
position: absolute;
1313
left: 0;
14-
top: 520px;
14+
top: 472px;
1515
width: 450px;
1616
}
1717
</style>
Lines changed: 30 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1-
page.title=Progress &amp; Activity
1+
page.title=Progress and Activity
22
@jd:body
33

4-
<p>Progress bars and activity indicators signal to users that something is happening that will take a moment.</p>
5-
<h2 id="progress">Progress bars</h2>
4+
<p>When an operation of interest to the user is taking place over a relatively long period of time,
5+
provide visual feedback that it's still happening and in the process of being completed.</p>
6+
<h2 id="progress">Progress</h2>
67

7-
<p>Progress bars are for situations where the percentage completed can be determined. They give users a quick sense of how much longer an operation will take.</p>
8+
<p>If you know the percentage of the operation that has been completed, use a determinate progress bar
9+
to give the user a sense of how much longer it will take.</p>
810

911
<img src="{@docRoot}design/media/progress_download.png">
1012

11-
<p>A progress bar should always fill from 0% to 100% and never move backwards to a lower value. If multiple operations are happening in sequence, use the progress bar to represent the delay as a whole, so that when the bar reaches 100%, it doesn't return back to 0%.</p>
13+
<p>The progress bar should always travel from 0% to 100% completion. Avoid setting the bar to a lower
14+
value than a previous value, or using the same progress bar to represent the progress of multiple
15+
events, since doing so makes the display meaningless. If you're not sure how long a particular
16+
operation will take, use an indeterminate progress indicator.</p>
1217

1318
<div class="vspace size-2">&nbsp;</div>
1419

@@ -17,11 +22,12 @@ page.title=Progress &amp; Activity
1722
Progress bar in Holo Dark and Holo Light.
1823
</div>
1924

20-
<h2 id="activity">Activity indicators</h2>
25+
<h2 id="activity">Activity</h2>
2126

22-
<p>Activity indicators are for operations of an indeterminate length. They ask users to wait a moment while something finishes up, without getting into specifics about what's happening behind the scenes.</p>
27+
<p>If you don't know how much longer an operation will continue, use an indeterminate progress
28+
indicator. There are two styles available: a flat bar and a circle. Use the one that best fits the
29+
available space.</p>
2330

24-
<p>Two styles are available: a bar and a circle. Each is offered in a variety of sizes, in both Holo Light and Holo Dark themes. Choose the appropriate style and size for the surrounding context. For example, the largest activity circle works well when displayed in a blank content area, but not in a smaller dialog box. Each operation should only be represented by one activity indicator.</p>
2531

2632
<div class="layout-content-row">
2733
<div class="layout-content-col span-6">
@@ -32,8 +38,14 @@ page.title=Progress &amp; Activity
3238
<div class="layout-content-col span-7 with-callouts">
3339

3440
<ol>
35-
<li class="value-1"><h4>Activity bar</h4>
36-
<p>In this example, an activity bar (in Holo Dark) appears when a user first requests a download. There's an unknown period of time when the download has not yet started. As soon as the download starts, this activity bar transforms into a progress bar.</p>
41+
<li class="value-1"><h4>Activity bar (shown with the Holo Dark theme)</h4>
42+
<p>
43+
44+
An indeterminate activity bar is used at the start of an application download because the Play Store
45+
app hasn't been able to contact the server yet, and it's not possible to determine how long it will
46+
take for the download to begin.
47+
48+
</p>
3749
</li>
3850
</ol>
3951

@@ -49,54 +61,19 @@ page.title=Progress &amp; Activity
4961
<div class="layout-content-col span-7 with-callouts">
5062

5163
<ol>
52-
<li class="value-2"><h4>Activity circle</h4>
53-
<p>In this example, an activity circle (in Holo Light) is used in the Gmail application when a message is being loaded because it's not possible to determine how long it will take to download the email.</p>
54-
<p>When displaying an activity circle, do not include text to communicate what the app is doing. The moving circle alone provides sufficient feedback about the delay, and does so in an understated way that minimizes the impact.</p>
64+
<li class="value-2"><h4>Activity circle (shown with the Holo Light theme)</h4>
5565
<p>
56-
<div class="layout-content-col span-3" style="margin-left:0">
57-
<div class="do-dont-label bad">Don't</div>
58-
<img src="{@docRoot}design/media/progress_activity_dont.png">
59-
</div>
60-
61-
<div class="layout-content-col span-3">
62-
<div class="do-dont-label good">Do</div>
63-
<img src="{@docRoot}design/media/progress_activity_do.png">
64-
</div>
66+
67+
An indeterminate activity circle is used in the Gmail application when a message is being
68+
loaded because it's not possible to determine how long it will take to download the email.
69+
6570
</p>
6671
</li>
6772
</ol>
6873

6974
</div>
7075
</div>
7176

72-
<h2 id="custom-indicators">Custom indicators</h2>
73-
<p>The standard progress bar and activity indicators work well for most situations and should be used whenever possible to provide a consistent experience across Android. However, some situations may call for something more custom.</p>
74-
75-
<p>Here's an example:<br>
76-
In all of the Google Play apps (Music, Books, Movies, Magazines), we wanted the current download state of each item to be visible at all times at the top-level screen. These states are:
77-
<ul>
78-
<li>Not downloaded</li>
79-
<li>Temporarily downloaded (automatically cached by the app)</li>
80-
<li>Permanently downloaded on the device at the user's request</li>
81-
</ul>
82-
</p>
83-
<p>We also needed to indicate progress from one download state to another, because downloading is not instantaneous.</p>
84-
<p>This presented a challenge, because the Google Play apps use a variety of different layouts, and some of them are highly space-constrained. We didn't want this information to clutter the top-level screens, or compete too much with the cover art.</p>
85-
<p>So we designed a custom indicator that could show all of the information in a tiny footprint, with the flexibility to appear on top of content if necessary.</p>
86-
87-
<img src="{@docRoot}design/media/progress_activity_custom.png">
88-
89-
<p>The color indicates whether it's downloaded (blue) or not (gray). The appearance of the pin indicates whether the download is permanent (white, upright) or temporary (gray, diagonal). And when state is in the process of changing, progress is indicated by a moving pie chart.</p>
90-
91-
<div class="layout-content-row">
92-
<div class="layout-content-col span-9">
93-
<img src="{@docRoot}design/media/progress_activity_custom_app.png">
94-
</div>
95-
<div class="layout-content-col span-4">
96-
<div class="figure-caption">
97-
Across Google Play apps with different layouts, the same custom indicator appears with each item. It communicates download state as well as progress, in a compact package that can be incorporated into any screen design.
98-
</div>
99-
</div>
100-
</div>
101-
102-
<p>If you find that the standard indicators aren't meeting your needs (due to space constraints, state complexities), by all means design your own. Make it feel like part of the Android family by injecting some of the visual characteristics of the standard indicators. In this example, we carried over the circular shape, the same shade of blue, and the flat and simple style.</p>
77+
<p>You should only use one activity indicator on screen per activity, and it should appropriately sized
78+
for the surrounding context. For example, the largest activity circle works well when displayed in a
79+
blank content area, but not in a smaller dialog box.</p>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ page.title=Tabs
66
<p>Tabs in the action bar make it easy to explore and switch between different views or functional
77
aspects of your app, or to browse categorized data sets.</p>
88

9-
<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>
109

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

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

3938

40-
<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 display all items concurrently. To navigate to a different view, touch the tab.</p>
4140

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

docs/html/design/design_toc.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<li class="nav-section">
2727
<div class="nav-section-header"><a href="<?cs var:toroot ?>design/patterns/index.html">Patterns</a></div>
2828
<ul>
29-
<li><a href="<?cs var:toroot ?>design/patterns/new.html">New in Android</a></li>
29+
<li><a href="<?cs var:toroot ?>design/patterns/new-4-0.html">New in Android 4.0</a></li>
3030
<li><a href="<?cs var:toroot ?>design/patterns/gestures.html">Gestures</a></li>
3131
<li><a href="<?cs var:toroot ?>design/patterns/app-structure.html">App Structure</a></li>
3232
<li><a href="<?cs var:toroot ?>design/patterns/navigation.html">Navigation</a></li>
@@ -36,11 +36,8 @@
3636
<li><a href="<?cs var:toroot ?>design/patterns/selection.html">Selection</a></li>
3737
<li><a href="<?cs var:toroot ?>design/patterns/notifications.html">Notifications</a></li>
3838
<li><a href="<?cs var:toroot ?>design/patterns/settings.html">Settings</a></li>
39-
<li><a href="<?cs var:toroot ?>design/patterns/help.html">Help</a></li>
4039
<li><a href="<?cs var:toroot ?>design/patterns/compatibility.html">Compatibility</a></li>
41-
<li><a href="<?cs var:toroot ?>design/patterns/accessibility.html">Accessibility</a></li>
4240
<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>
4441
</ul>
4542
</li>
4643

@@ -66,8 +63,4 @@
6663
<div class="nav-section-header empty"><a href="<?cs var:toroot ?>design/downloads/index.html">Downloads</a></div>
6764
</li>
6865

69-
<li class="nav-section">
70-
<div class="nav-section-header empty"><a href="<?cs var:toroot ?>design/extras/index.html">Extras</a></div>
71-
</li>
72-
7366
</ul>

docs/html/design/extras/index.jd

Lines changed: 0 additions & 22 deletions
This file was deleted.
-196 KB
Binary file not shown.
-48.8 KB
Binary file not shown.
50.4 KB
107 KB

0 commit comments

Comments
 (0)