summaryrefslogtreecommitdiffstats
path: root/docs/html/design/building-blocks
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/design/building-blocks')
-rw-r--r--docs/html/design/building-blocks/buttons.jd8
-rw-r--r--docs/html/design/building-blocks/dialogs.jd19
-rw-r--r--docs/html/design/building-blocks/grid-lists.jd9
-rw-r--r--docs/html/design/building-blocks/lists.jd25
-rw-r--r--docs/html/design/building-blocks/progress.jd8
-rw-r--r--docs/html/design/building-blocks/scrolling.jd1
-rw-r--r--docs/html/design/building-blocks/seek-bars.jd8
-rw-r--r--docs/html/design/building-blocks/spinners.jd8
-rw-r--r--docs/html/design/building-blocks/switches.jd8
-rw-r--r--docs/html/design/building-blocks/tabs.jd10
-rw-r--r--docs/html/design/building-blocks/text-fields.jd9
11 files changed, 107 insertions, 6 deletions
diff --git a/docs/html/design/building-blocks/buttons.jd b/docs/html/design/building-blocks/buttons.jd
index 3a34601..e698f38 100644
--- a/docs/html/design/building-blocks/buttons.jd
+++ b/docs/html/design/building-blocks/buttons.jd
@@ -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>
diff --git a/docs/html/design/building-blocks/dialogs.jd b/docs/html/design/building-blocks/dialogs.jd
index 53d99b8..9c91abf 100644
--- a/docs/html/design/building-blocks/dialogs.jd
+++ b/docs/html/design/building-blocks/dialogs.jd
@@ -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>
@@ -35,7 +43,7 @@ user to adjust settings or enter text.</p>
<h4>Action buttons</h4>
<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>
<ul>
-
+
<li>The dismissive action of a dialog is always on the left. Dismissive actions return to the user to the previous state.</li>
<li>The affirmative actions are on the right. Affirmative actions continue progress toward the user goal that triggered the dialog.</li>
</ul>
@@ -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>
diff --git a/docs/html/design/building-blocks/grid-lists.jd b/docs/html/design/building-blocks/grid-lists.jd
index d98637c..ac3a3eb 100644
--- a/docs/html/design/building-blocks/grid-lists.jd
+++ b/docs/html/design/building-blocks/grid-lists.jd
@@ -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>
diff --git a/docs/html/design/building-blocks/lists.jd b/docs/html/design/building-blocks/lists.jd
index 4949d00..6f69feb 100644
--- a/docs/html/design/building-blocks/lists.jd
+++ b/docs/html/design/building-blocks/lists.jd
@@ -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>
diff --git a/docs/html/design/building-blocks/progress.jd b/docs/html/design/building-blocks/progress.jd
index 6946a75..2de75dc 100644
--- a/docs/html/design/building-blocks/progress.jd
+++ b/docs/html/design/building-blocks/progress.jd
@@ -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>
diff --git a/docs/html/design/building-blocks/scrolling.jd b/docs/html/design/building-blocks/scrolling.jd
index 41e7cec..04b1e4a 100644
--- a/docs/html/design/building-blocks/scrolling.jd
+++ b/docs/html/design/building-blocks/scrolling.jd
@@ -2,6 +2,7 @@ page.title=Scrolling
page.tags=scrollview,listview
@jd:body
+
<p>Scrolling allows the user to navigate to content in the overflow using a swipe gesture. The
scrolling speed is proportional to the speed of the gesture.</p>
<h2 id="indicator">Scroll Indicator</h2>
diff --git a/docs/html/design/building-blocks/seek-bars.jd b/docs/html/design/building-blocks/seek-bars.jd
index 1465688..5c42102 100644
--- a/docs/html/design/building-blocks/seek-bars.jd
+++ b/docs/html/design/building-blocks/seek-bars.jd
@@ -2,6 +2,14 @@ page.title=Seek Bars and Sliders
page.tags=seekbar,progressbar
@jd:body
+<a class="notice-designers-material"
+ href="http://www.google.com/design/spec/components/sliders.html">
+ <div>
+ <h3>Material Design</h3>
+ <p>Sliders<p>
+ </div>
+</a>
+
<p>Interactive sliders make it possible to select a value from a continuous or discrete range of values
by moving the slider thumb. The smallest value is to the left, the largest to the right. The
interactive nature of the slider makes it a great choice for settings that reflect intensity levels,
diff --git a/docs/html/design/building-blocks/spinners.jd b/docs/html/design/building-blocks/spinners.jd
index f7d80e7..3a74ccf 100644
--- a/docs/html/design/building-blocks/spinners.jd
+++ b/docs/html/design/building-blocks/spinners.jd
@@ -2,6 +2,14 @@ page.title=Spinners
page.tags=spinner,dropdown
@jd:body
+<a class="notice-designers-material"
+ href="http://www.google.com/design/spec/components/menus.html">
+ <div>
+ <h3>Material Design</h3>
+ <p>Menus<p>
+ </div>
+</a>
+
<a class="notice-developers" href="{@docRoot}guide/topics/ui/controls/spinner.html">
<div>
<h3>Developer Docs</h3>
diff --git a/docs/html/design/building-blocks/switches.jd b/docs/html/design/building-blocks/switches.jd
index d435657..9dd09ca 100644
--- a/docs/html/design/building-blocks/switches.jd
+++ b/docs/html/design/building-blocks/switches.jd
@@ -2,6 +2,14 @@ page.title=Switches
page.tags=switch,checkbox,radiobutton,button
@jd:body
+<a class="notice-designers-material"
+ href="http://www.google.com/design/spec/components/selection-controls.html">
+ <div>
+ <h3>Material Design</h3>
+ <p>Selection Controls<p>
+ </div>
+</a>
+
<p>Switches allow the user to select options. There are three kinds of switches: checkboxes, radio
buttons, and on/off switches.</p>
diff --git a/docs/html/design/building-blocks/tabs.jd b/docs/html/design/building-blocks/tabs.jd
index 93818c3..078de92 100644
--- a/docs/html/design/building-blocks/tabs.jd
+++ b/docs/html/design/building-blocks/tabs.jd
@@ -4,10 +4,18 @@ page.tags=tabs,actionbar,navigation,viewpager
<img src="{@docRoot}design/media/tabs_overview.png">
+<a class="notice-designers-material"
+ href="http://www.google.com/design/spec/components/tabs.html">
+ <div>
+ <h3>Material Design</h3>
+ <p>Tabs<p>
+ </div>
+</a>
+
<a class="notice-developers" href="{@docRoot}training/implementing-navigation/lateral.html">
<div>
<h3>Developer Docs</h3>
- <p>Creating Swipe Views with Tabs</p>
+ <p>Creating Swipe Views<br>with Tabs</p>
</div>
</a>
diff --git a/docs/html/design/building-blocks/text-fields.jd b/docs/html/design/building-blocks/text-fields.jd
index e109d5f..19c22f9 100644
--- a/docs/html/design/building-blocks/text-fields.jd
+++ b/docs/html/design/building-blocks/text-fields.jd
@@ -2,6 +2,15 @@ page.title=Text Fields
page.tags=text,edittext,input
@jd:body
+
+<a class="notice-designers-material"
+ href="http://www.google.com/design/spec/components/text-fields.html">
+ <div>
+ <h3>Material Design</h3>
+ <p>Text Fields<p>
+ </div>
+</a>
+
<a class="notice-developers" href="{@docRoot}guide/topics/ui/controls/text.html">
<div>
<h3>Developer Docs</h3>