Skip to content

Commit 96c757e

Browse files
romannurikAndroid (Google) Code Review
authored andcommitted
Merge "docs: move Android Design from static HTML to JD" into ics-mr1
2 parents 66895ad + b99ae73 commit 96c757e

File tree

285 files changed

+2709
-9554
lines changed

Some content is hidden

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

285 files changed

+2709
-9554
lines changed

docs/html/design/building-blocks/buttons.html

Lines changed: 0 additions & 197 deletions
This file was deleted.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
page.title=Buttons
2+
@jd:body
3+
4+
<p>A button consists of text and/or an image that clearly communicates what action will occur when the
5+
user touches it. Android supports two different types of buttons: <em>basic buttons</em> and <em>borderless
6+
buttons</em>. Both can contain text labels and/or images.</p>
7+
8+
<div style="text-align: center">
9+
<img src="{@docRoot}design/media/buttons_basic.png">
10+
</div>
11+
12+
<h2 id="basic">Basic Buttons</h2>
13+
14+
<p>Basic buttons are traditional buttons with borders and background. Android supports two styles for
15+
basic buttons: default and small. Default buttons have slightly larger font size and are optimized
16+
for display outside of form content. Small buttons are intended for display alongside other content.
17+
They have a smaller font and smaller minimum height. Use small buttons in forms where they need to
18+
align with other UI elements.</p>
19+
20+
<img src="{@docRoot}design/media/buttons_default_small.png">
21+
<div class="layout-content-row">
22+
<div class="layout-content-col span-6">
23+
<div class="figure-caption">
24+
Default buttons in Holo Dark &amp; Light.
25+
</div>
26+
</div>
27+
<div class="layout-content-col span-6">
28+
<div class="figure-caption">
29+
Small buttons in Holo Dark &amp; Light.
30+
</div>
31+
</div>
32+
</div>
33+
34+
<h2 id="borderless">Borderless Buttons</h2>
35+
36+
<p>Borderless buttons resemble basic buttons except that they have no borders or background. You can
37+
use borderless buttons with both icons and text. Borderless buttons are visually more lightweight
38+
than basic buttons and integrate nicely with other content.</p>
39+
40+
<img src="{@docRoot}design/media/buttons_borderless.png">

0 commit comments

Comments
 (0)