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

Commit 6b962174 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am cea1f19c: Merge "add links from various design docs to corresponding... 

am cea1f19c: Merge "add links from various design docs to corresponding developer docs" into jb-dev-docs

* commit 'cea1f19c':
  add links from various design docs to corresponding developer docs
parents 5713b5bc cea1f19c

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -36,3 +36,10 @@ use borderless buttons with both icons and text. Borderless buttons are visually 
than basic buttons and integrate nicely with other content.</p>

than basic buttons and integrate nicely with other content.</p>





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

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





<div class="note develop">

<p><strong>Developer Guide</strong></p>

  <p>For information about how to build and customize buttons in your app,

  see the <a href="{@docRoot}guide/topics/ui/controls/button.html">Buttons</a> API guide.</p>

</div>

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

+13 −0
Original line number Original line Diff line number Diff line
@@ -122,6 +122,12 @@ available based on the title and the text of the action buttons.</p> 
  </div>

  </div>

</div>

</div>





<div class="note develop">

<p><strong>Developer Guide</strong></p>

  <p>For information about how to build dialogs in your app,

  see the <a href="{@docRoot}guide/topics/ui/dialogs.html">Dialogs</a> API guide.</p>

</div>



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

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





<p>Popups are lightweight version of dialogs that require a single selection from the user. Popups

<p>Popups are lightweight version of dialogs that require a single selection from the user. Popups
@@ -150,3 +156,10 @@ continue editing later. Toasts automatically disappear after a timeout.</p> 




  </div>

  </div>

</div>

</div>





<div class="note develop">

<p><strong>Developer Guide</strong></p>

  <p>For information about how to create toasts,

  see the <a href="{@docRoot}guide/topics/ui/notifiers/toasts.html">Toasts</a> API guide.</p>

</div>

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -29,3 +29,10 @@ app helps ensure that a user's specification of a data or time input is valid an 
correctly. The format of a time and date picker adjusts automatically to the locale.</p>

correctly. The format of a time and date picker adjusts automatically to the locale.</p>





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

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





<div class="note develop">

<p><strong>Developer Guide</strong></p>

  <p>For information about how to create date and time pickers,

  see the <a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a> API guide.</p>

</div>

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -35,3 +35,10 @@ tabs.</p> 
<div class="figure-caption">

<div class="figure-caption">

  Spinners in the Holo Dark and Holo Light themes, in various states.

  Spinners in the Holo Dark and Holo Light themes, in various states.

</div>

</div>





<div class="note develop">

<p><strong>Developer Guide</strong></p>

  <p>For information about how to create spinners,

  see the <a href="{@docRoot}guide/topics/ui/controls/spinner.html">Spinners</a> API guide.</p>

</div>

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -23,3 +23,11 @@ consider a spinner, which uses less space.</p> 
<p>On/off switches toggle the state of a single settings option.</p>

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





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

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



<div class="note develop">

<p><strong>Developer Guide</strong></p>

  <p>For information about how to create these different switches,

  see the <a href="{@docRoot}guide/topics/ui/controls/checkbox.html">Checkboxes</a>,

  <a href="{@docRoot}guide/topics/ui/controls/radiobutton.html">Radio Buttons</a>, or

  <a href="{@docRoot}guide/topics/ui/controls/togglebutton.html">Toggle Buttons</a> API guides.</p>

</div>