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

Commit af5f2000 authored by Joe Fernandez's avatar Joe Fernandez Committed by Android (Google) Code Review
Browse files

Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs

parents 00f857c5 49ca2de8

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

+8 −0
Original line number Diff line number Diff line
@@ -2,6 +2,14 @@ page.title=Buttons 
page.tags=button,input

@jd:body



<a class="notice-designers-material"

  href="http://www.google.com/design/spec/components/buttons.html">

  <div>

    <h3>Material Design</h3>

    <p>Buttons<p>

  </div>

</a>



<a class="notice-developers" href="{@docRoot}guide/topics/ui/controls/button.html">

  <div>

    <h3>Developer Docs</h3>

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

+18 −1
Original line number Diff line number Diff line
@@ -2,6 +2,14 @@ page.title=Dialogs 
page.tags=dialog,alert,popup,toast

@jd:body



<a class="notice-designers-material"

  href="http://www.google.com/design/spec/components/dialogs.html">

  <div>

    <h3>Material Design</h3>

    <p>Dialogs<p>

  </div>

</a>



<a class="notice-developers" href="{@docRoot}guide/topics/ui/dialogs.html">

  <div>

    <h3>Developer Docs</h3>
@@ -152,6 +160,15 @@ advances the workflow, and simply touching outside the popup dismisses it.</p> 
away from an email before you send it triggers a "Draft saved" toast to let you know that you can

continue editing later. Toasts automatically disappear after a timeout.</p>



<a class="notice-designers-material left"

  href="http://www.google.com/design/spec/components/snackbars-toasts.html">

  <div>

    <h3>Material Design</h3>

    <p>Toasts<p>

  </div>

</a>





<a class="notice-developers left" href="{@docRoot}guide/topics/ui/notifiers/toasts.html">

  <div>

    <h3>Developer Docs</h3>

docs/html/design/building-blocks/grid-lists.jd

+9 −0
Original line number Diff line number Diff line
@@ -4,6 +4,15 @@ page.tags=gridview,layout,listview 


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





<a class="notice-designers-material"

  href="http://www.google.com/design/spec/components/grid-lists.html">

  <div>

    <h3>Material Design</h3>

    <p>Grid lists<p>

  </div>

</a>



<a class="notice-developers" href="{@docRoot}guide/topics/ui/layout/gridview.html">

  <div>

    <h3>Developer Docs</h3>

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

+21 −4
Original line number Diff line number Diff line
@@ -2,10 +2,11 @@ page.title=Lists 
page.tags=listview,layout

@jd:body



<a class="notice-developers" href="{@docRoot}guide/topics/ui/layout/listview.html">

<a class="notice-designers-material"

  href="http://www.google.com/design/spec/components/lists.html">

  <div>

    <h3>Developer Docs</h3>

    <p>List View</p>

    <h3>Material Design</h3>

    <p>Lists<p>

  </div>

</a>
@@ -22,7 +23,7 @@ well as drilldown navigation.</p> 
  </div>

  <div class="layout-content-col span-4 with-callouts">



<ol>

<ol style="margin-bottom: 60px;">

<li>

<h4>Section Divider</h4>

<p>Use section dividers to organize the content of your list into groups and facilitate scanning.</p>
@@ -35,5 +36,21 @@ well as drilldown navigation.</p> 
</li>

</ol>



<a class="notice-developers" href="{@docRoot}guide/topics/ui/layout/listview.html">

  <div>

    <h3>Developer Docs</h3>

    <p>List View</p>

  </div>

</a>



<a class="notice-designers-material"

  href="http://www.google.com/design/spec/components/lists-controls.html">

  <div>

    <h3>Material Design</h3>

    <p>Lists: Controls<p>

  </div>

</a>





  </div>

</div>

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

+8 −0
Original line number Diff line number Diff line
@@ -2,6 +2,14 @@ page.title=Progress &amp; Activity 
page.tags=progressbar,download,network

@jd:body



<a class="notice-designers-material"

  href="http://www.google.com/design/spec/components/progress-activity.html">

  <div>

    <h3>Material Design</h3>

    <p>Progress and Activity<p>

  </div>

</a>



<p>Progress bars and activity indicators signal to users that something is happening that will take a moment.</p>

<h2 id="progress">Progress bars</h2>