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

Commit 90c2eea8 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 59ea115d: Cherrypick from ics-mr1 Change-Id:... 

am 59ea115d: Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 docs: Remove side padding built into Design images to improve alignment. a few HTML adjustments for alignment as well

* commit '59ea115d':
  Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 docs: Remove side padding built into Design images to improve alignment. a few HTML adjustments for alignment as well
parents 8b389539 59ea115d

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

+1 −3
Original line number Diff line number Diff line
@@ -5,9 +5,7 @@ page.title=Buttons 
user touches it. Android supports two different types of buttons: <em>basic buttons</em> and <em>borderless

buttons</em>. Both can contain text labels and/or images.</p>



<div style="text-align: center">

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

</div>



<h2 id="basic">Basic Buttons</h2>

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

+1 −2
Original line number Diff line number Diff line
@@ -6,13 +6,12 @@ up/down arrow buttons, it's possible to set the desired value from the keyboard 
gesture.</p>



<div class="layout-content-row">

  <div class="layout-content-col span-2">&nbsp;</div>

  <div class="layout-content-col span-6">



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



  </div>

  <div class="layout-content-col span-5">

  <div class="layout-content-col span-6">



<h4>Space considerations</h4>

<p>Pickers can be used inline on a form, but their relatively large footprint is best suited for

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

+0 −6
Original line number Diff line number Diff line
@@ -8,9 +8,7 @@ buttons, and on/off switches.</p> 
<p>Checkboxes allow the user to select multiple options from a set. Avoid using a single checkbox to

turn an option off or on. Instead, use an on/off switch.</p>



<div style="text-align: center">

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

</div>



<h2 id="radio-buttons">Radio Buttons</h2>
@@ -18,14 +16,10 @@ turn an option off or on. Instead, use an on/off switch.</p> 
selection if you think that the user needs to see all available options side-by-side. Otherwise,

consider a spinner, which uses less space.</p>



<div style="text-align: center">

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

</div>



<h2 id="switches">On/off Switches</h2>



<p>On/off switches toggle the state of a single settings option.</p>



<div style="text-align: center">

  <img src="{@docRoot}design/media/switches_switches.png">
 
</div>

docs/html/design/media/action_bar_basics.png

−853 B (12.7 KiB)
Loading image diff...

docs/html/design/media/action_bar_cab.png

+71.1 KiB (265 KiB)
Loading image diff...