diff options
| author | Robert Ly <robertly@google.com> | 2014-06-23 22:06:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-23 21:50:10 +0000 |
| commit | 7cfd2e03c474cccb413522b663cf08b9bbbc0cca (patch) | |
| tree | 655f17cdeb5bd1c21d17c13ab38a127500d4af9e /docs/html | |
| parent | 0ceb16d96059d8769a296af8c5ca916198a2cda6 (diff) | |
| parent | 93de481209d2f13bee9e9e51b2f323311ce0c9dd (diff) | |
| download | frameworks_base-7cfd2e03c474cccb413522b663cf08b9bbbc0cca.zip frameworks_base-7cfd2e03c474cccb413522b663cf08b9bbbc0cca.tar.gz frameworks_base-7cfd2e03c474cccb413522b663cf08b9bbbc0cca.tar.bz2 | |
Merge "docs: fix lmp and index pages" into klp-modular-dev
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/images/home/auto.png | bin | 8772 -> 9922 bytes | |||
| -rw-r--r-- | docs/html/images/home/tv.png | bin | 3107 -> 3110 bytes | |||
| -rw-r--r-- | docs/html/images/home/wear.png | bin | 3920 -> 3943 bytes | |||
| -rw-r--r-- | docs/html/index.jd | 30 | ||||
| -rw-r--r-- | docs/html/preview/index.html | 6 |
5 files changed, 28 insertions, 8 deletions
diff --git a/docs/html/images/home/auto.png b/docs/html/images/home/auto.png Binary files differindex 233d69d..7ea01b0 100644 --- a/docs/html/images/home/auto.png +++ b/docs/html/images/home/auto.png diff --git a/docs/html/images/home/tv.png b/docs/html/images/home/tv.png Binary files differindex 47bf4b0..3cf2034 100644 --- a/docs/html/images/home/tv.png +++ b/docs/html/images/home/tv.png diff --git a/docs/html/images/home/wear.png b/docs/html/images/home/wear.png Binary files differindex c7a2045..dfaded7 100644 --- a/docs/html/images/home/wear.png +++ b/docs/html/images/home/wear.png diff --git a/docs/html/index.jd b/docs/html/index.jd index c2bf6b6..2f01538 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -7,7 +7,7 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3 @jd:body <!-- Top full-bleed carousel --> -<div class="home-new-carousel-1"> +<div class="home-new-carousel-1" style="margin-top:40px"> <div class="fullscreen-carousel-content"> <div class="vcenter"> <div class="wrap clearfix"> @@ -42,7 +42,7 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3 </div> <!-- end .fullscreen-carousel-content --> </div> <!-- end .fullscreen-carousel --> -<div class="actions-bar"> +<div class="actions-bar" style="margin-top:30px"> <div class="wrap"> <div class="actions"> <div><a href="{@docRoot}sdk/index.html">Get the SDK</a></div> @@ -68,13 +68,33 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3 <div class="landing-body" style="margin-top: 80px;"> <div class="landing-breakout cols"> <div class="col-3-wide"> - <a href="{@docRoot}wear/index.html"><img src="{@docRoot}images/home/wear.png"></a> + <img src="{@docRoot}images/home/wear.png"> + <p class="landing-small" style="margin-top:30px"> + Provide information on-the-go for your users, whenever they need it. + </p> + <p class="landing-small"> + <a href="{@docRoot}wear/index.html">Learn about Android Wear</a> + </p> </div> <div class="col-3-wide"> - <a href="{@docRoot}tv/index.html"><img src="{@docRoot}images/home/tv.png"></a> + <img src="{@docRoot}images/home/tv.png"> + <p class="landing-small" style="margin-top:30px"> + Build your apps for the big screen and bring your content to life. + </p> + <p class="landing-small"> + <a href="{@docRoot}tv/index.html">Learn about Android TV</a> + + </p> </div> <div class="col-3-wide"> - <a href="{@docRoot}auto/index.html"><img src="{@docRoot}images/home/auto.png"></a> + <img src="{@docRoot}images/home/auto.png"> + <p class="landing-small" style="margin-top:30px"> + Extend your music apps to automobile + entertainment systems. + </p> + <p class="landing-small"> + <a href="{@docRoot}auto/index.html">Learn about Android Auto</a> + </p> </div> </div> </div> diff --git a/docs/html/preview/index.html b/docs/html/preview/index.html index ff4572b..e657415 100644 --- a/docs/html/preview/index.html +++ b/docs/html/preview/index.html @@ -241,7 +241,7 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> Let us know when you encounter problems, so we can fix them and make the platform better for you and your users. </p><p class="landing-small"> - <a target="_blank" href="https://code.google.com/p/android-developer-preview/"> + <a href="https://code.google.com/p/android-developer-preview/"> Report Issues</a> </p> <p></p> @@ -257,7 +257,7 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> Join the community of Android developers testing out the L Developer Preview and share your thoughts and experiences. </p><p class="landing-small"> - <a target="_blank" href="https://plus.sandbox.google.com/communities/113159138894928487684"> + <a href="https://plus.sandbox.google.com/communities/113159138894928487684"> Discuss on Google+</a> </p> </div> @@ -274,7 +274,7 @@ href="//fonts.googleapis.com/css?family=Roboto+Condensed"> for news about the changes. </p> <p class="landing-small"> - <a target="_blank" href="/preview/support.html">Get Support</a> + <a href="/preview/support.html">Get Support</a> </p> </div> </div> |
