summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-11-25 17:38:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-25 17:38:15 +0000
commitcde2015889a26926c72d72c6b15c46ed1c3b5ead (patch)
tree966f537d3f00b9857761202e581bae4c9e22cbf7
parent98c2090de433a79d8b042652cfdccb1a03953176 (diff)
parentf00d46db377b97da673f8699928d8343b3bc132d (diff)
downloadframeworks_base-cde2015889a26926c72d72c6b15c46ed1c3b5ead.zip
frameworks_base-cde2015889a26926c72d72c6b15c46ed1c3b5ead.tar.gz
frameworks_base-cde2015889a26926c72d72c6b15c46ed1c3b5ead.tar.bz2
am f00d46db: am 79b496e8: am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs
* commit 'f00d46db377b97da673f8699928d8343b3bc132d': add intro videos (w/ shadowbox) to Auto and Wear landing pages.
-rw-r--r--docs/html/auto/index.jd17
-rw-r--r--docs/html/wear/index.jd6
2 files changed, 13 insertions, 10 deletions
diff --git a/docs/html/auto/index.jd b/docs/html/auto/index.jd
index 129478a..7d9400f 100644
--- a/docs/html/auto/index.jd
+++ b/docs/html/auto/index.jd
@@ -78,7 +78,7 @@ page.type=about
<div class="landing-section-header">
<div class="landing-h1 hero">Android Auto</div>
<div class="landing-subhead hero">Audio entertainment and
- messaging services in the car</div>
+ messaging services in the car.</div>
<div class="landing-hero-description">
<p style="width:450px">Let drivers listen to and control
content in your music and other audio apps. Allow drivers to
@@ -86,12 +86,15 @@ page.type=about
car's controls and screen.</p>
</div>
- <div class="landing-body">
+ <div class="landing-body" style="margin-top:40px;">
<a href="{@docRoot}training/auto/index.html"
- class="landing-button landing-primary"
- style="margin-top:40px;">
+ class="landing-button landing-primary">
Get Started
</a>
+ <a href="https://www.youtube.com/watch?v=ctiaVxgclsg" class="video-shadowbox-button white"
+ style="margin-left:40px">
+ Watch the Intro Video
+ </a>
</div>
</div>
</div>
@@ -110,7 +113,7 @@ page.type=about
<div class="landing-section landing-gray-background" id="android-in-car">
<div class="wrap">
- <div class="landing-section-h1">
+ <div class="landing-section-header">
<div class="landing-h1">Extending Android to Cars</div>
<div class="landing-subhead">Android Auto brings the Android
platform into the car with a user interface that's optimized for driving.</div>
@@ -131,10 +134,6 @@ page.type=about
</div>
</div>
</div>
- <p>Before you start building, check out the
- <a href="http://youtu.be/ctiaVxgclsg" class="external-link">Introduction to Android Auto</a> video to understand how
- users see and interact with your app in Android Auto.
- </p>
</div>
</div> <!-- end .wrap -->
</div> <!-- end .landing-section -->
diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd
index c372395..409488e 100644
--- a/docs/html/wear/index.jd
+++ b/docs/html/wear/index.jd
@@ -39,7 +39,7 @@ page.type=about
<div class="col-10">
<div class="landing-section-header">
<div class="landing-h1 hero">Android Wear</div>
- <div class="landing-subhead hero">Information that moves with you</div>
+ <div class="landing-subhead hero">Information that moves with you.</div>
</div>
<div class="landing-hero-description">
@@ -54,6 +54,10 @@ page.type=about
<a href="{@docRoot}training/building-wearables.html" class="landing-button landing-primary" style="margin-top: 40px;">
Get Started
</a>
+ <a href="https://www.youtube.com/watch?v=Bl4Qne-RpcM" class="video-shadowbox-button white"
+ style="margin-left:40px">
+ Watch the Intro Video
+ </a>
</div>
</div>