summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-12-09 21:16:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-09 21:16:41 +0000
commit5155840ba091f62ea3079328b25a620089223887 (patch)
tree683c22fe5f73dcf55b14116d3743b360318e19d2
parente8f6cb065c33c21dfefe0039739dc38fde5cff6d (diff)
parent8ba131684fc0bdc42b17119da796bb971a9c766a (diff)
downloadframeworks_base-5155840ba091f62ea3079328b25a620089223887.zip
frameworks_base-5155840ba091f62ea3079328b25a620089223887.tar.gz
frameworks_base-5155840ba091f62ea3079328b25a620089223887.tar.bz2
Merge "docs: Adding links to material design videos" into lmp-docs
-rw-r--r--docs/html/design/material/index.jd34
1 files changed, 34 insertions, 0 deletions
diff --git a/docs/html/design/material/index.jd b/docs/html/design/material/index.jd
index db18a83..4d9a1a7 100644
--- a/docs/html/design/material/index.jd
+++ b/docs/html/design/material/index.jd
@@ -5,6 +5,40 @@ page.image=design/material/images/MaterialLight.png
@jd:body
+<!-- developer docs box -->
+<a class="notice-developers right" href="{@docRoot}training/material/index.html">
+ <div>
+ <h3>Developer Docs</h3>
+ <p>Creating Apps with Material Design</p>
+ </div>
+</a>
+
+<!-- video box -->
+<a class="notice-developers-video" href="https://www.youtube.com/watch?v=p4gmvHyuZzw">
+<div>
+ <h3>Video</h3>
+ <p>Introduction to Material Design</p>
+</div>
+</a>
+
+<!-- video box -->
+<a class="notice-developers-video" href="https://www.youtube.com/watch?v=YaG_ljfzeUw">
+<div>
+ <h3>Video</h3>
+ <p>Paper and Ink: The Materials that Matter</p>
+</div>
+</a>
+
+<!-- video box -->
+<a class="notice-developers-video" href="https://www.youtube.com/watch?v=XOcCOBe8PTc">
+<div>
+ <h3>Video</h3>
+ <p>Material Design in the Google I/O App</p>
+</div>
+</a>
+
+
+
<p itemprop="description">Material design is a comprehensive guide for visual, motion, and
interaction design across platforms and devices. Android now includes support for
material design apps. To use material design in your Android apps, follow the guidelines defined