am 259030cb: am fa28e8cc: Merge "docs: index landing" into klp-modular-dev
* commit '259030cba4dcc8146f378c13530cbaa53cccd92b':
docs: index landing
diff --git a/docs/html/index.jd b/docs/html/index.jd
index f101ad2..c9efcb3 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -6,43 +6,37 @@
@jd:body
-<!-- Top full-bleed carousel -->
-<div class="home-new-carousel-1" style="margin-top:40px">
+<div class="home-new-carousel-1">
<div class="fullscreen-carousel-content">
<div class="vcenter">
<div class="wrap clearfix">
<div class="static resource-flow-layout wrap col-16">
<div class="resource resource-card resource-card-18x6">
- <div class="card-bg" style="background-image: url('/preview/images/l-dev-prev.png');"></div>
- <div class="card-info">
- <div class="section"></div>
- <div class="title">Android L Developer Preview</div>
- <div class="description ellipsis" style="height: 285px;">
- <div class="text" style="height: auto;">
- <p style="font-size:16px;">Get an early look at the next Android release and
- start using new APIs so your apps are ready when the platform officially launches.</p>
- <p>
- <a href="{@docRoot}preview/index.html" class="landing-button landing-secondary">Learn more</a></p>
- </div>
- </div>
+
+
+ <div class="landing-section-header">
+ <div class="col-10"><img src="{@docRoot}preview/images/l-dev-prev.png" style=" margin:40px 60px 0 20px"></div>
+ <div class="col-5" style=" margin-top:60px "><p>
+ <h3>L Developer Preview</h3>
+ Get an early look at the next release of the Android platform.
+ The L Developer Preview lets you try out all the new features of the next major
+ release of Android. </p><br/>
+ <a href="{@docRoot}preview/index.html" class="landing-button landing-primary">Get Started</a>
</div>
</div>
+ </div>
</div>
-
- <div class="resource-widget resource-flow-layout wrap col-16 no-section"
- data-query="collection:index/primary"
- data-resourceStyle="card"
- data-sortOrder="-timestamp"
- data-maxResults="3"
- data-cardSizes="6x2,6x2,6x2">
- </div> <!-- end .resource-widget -->
+ <h2 style="margin-bottom: 0px;"> </h2>
+ <div style="margin-top:10px" class="resource-widget resource-flow-layout wrap col-16
+ no-section" data-query="collection:index/primary" data-resourcestyle="card"
+ data-sortorder="-timestamp" data-maxresults="3" data-cardsizes="6x2,6x2,6x2"></div> <!-- end .resource-widget -->
</div> <!-- end .wrap -->
</div> <!-- end .vcenter -->
</div> <!-- end .fullscreen-carousel-content -->
</div> <!-- end .fullscreen-carousel -->
-<div class="actions-bar" style="margin-top:30px">
+<div class="actions-bar" style="margin-top:40px">
<div class="wrap">
<div class="actions">
<div><a href="{@docRoot}sdk/index.html">Get the SDK</a></div>
@@ -59,16 +53,17 @@
<div class="landing-section">
<div class="wrap">
<div class="landing-section-header">
- <div class="landing-h1">Develop for Multiple Form Factors</div>
+
+ <div class="landing-h1" style="margin-top:0px">Build for a Multi-Screen World</div>
<div class="landing-subhead" style="margin-top: 20px;">
- Android runs on hundreds of millions of handheld devices around the world, <br />
+ Android runs on hundreds of millions of handheld devices around the world, <br>
and it now supports these exciting, new form-factors.
</div>
</div>
<div class="landing-body" style="margin-top: 50px;">
<div class="landing-breakout cols">
<div class="col-3-wide">
- <img src="{@docRoot}images/home/wear-wordmark.png" />
+ <img src="{@docRoot}images/home/wear-wordmark.png">
<img src="{@docRoot}images/home/wear.png">
<p class="landing-small">
Provide information on-the-go for your users, whenever they need it.
@@ -78,9 +73,9 @@
</p>
</div>
<div class="col-3-wide">
- <img src="{@docRoot}images/home/tv-wordmark.png" />
+ <img src="{@docRoot}images/home/tv-wordmark.png">
<img src="{@docRoot}images/home/tv.png">
- <p class="landing-small" >
+ <p class="landing-small">
Build your apps for the big screen and bring your content to life.
</p>
<p class="landing-small">
@@ -89,7 +84,7 @@
</p>
</div>
<div class="col-3-wide">
- <img src="{@docRoot}images/home/auto-wordmark.png" />
+ <img src="{@docRoot}images/home/auto-wordmark.png">
<img src="{@docRoot}images/home/auto.png">
<p class="landing-small">
Extend your music apps to automobile
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index a92236e..cd49ace 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -2,9 +2,9 @@
"index/primary": {
"title": "",
"resources": [
- "distribute/essentials/quality/tablets.html",
- "distribute/engage/game-services.html",
- "distribute/googleplay/edu/about.html"
+ "training/building-wearables.html",
+ "preview/material/index.html",
+ "sdk/installing/studio.html"
]
},
"index/devices": {
diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index 03bbea1..605af52 100644
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -15,17 +15,6 @@
DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
{
- "title":"Android L Developer Preview",
- "titleFriendly":"",
- "summary":"<p style='font-size:18px;'>Get an early look at the next release and get your apps ready when the platform officially launches.</p>",
- "url":"preview/index.html",
- "group":"",
- "keywords": [],
- "tags": [],
- "image":"preview/images/l-dev-prev.png",
- "type":""
- },
- {
"title":"Developer Registration",
"titleFriendly":"",
"summary":"Additional information about the registration process.",
@@ -1192,4 +1181,4 @@
"type": "",
"titleFriendly": ""
}
-]);
\ No newline at end of file
+]);
diff --git a/docs/html/wear/images/notifications.png b/docs/html/wear/images/notifications.png
new file mode 100644
index 0000000..8b1cb0b
--- /dev/null
+++ b/docs/html/wear/images/notifications.png
Binary files differ
diff --git a/docs/html/wear/images/steps.png b/docs/html/wear/images/steps.png
new file mode 100644
index 0000000..965f382
--- /dev/null
+++ b/docs/html/wear/images/steps.png
Binary files differ
diff --git a/docs/html/wear/images/voicecommands.png b/docs/html/wear/images/voicecommands.png
new file mode 100644
index 0000000..9839ed8
--- /dev/null
+++ b/docs/html/wear/images/voicecommands.png
Binary files differ
diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd
index 10e7d29..c9b8ba8 100644
--- a/docs/html/wear/index.jd
+++ b/docs/html/wear/index.jd
@@ -83,33 +83,35 @@
<div class="landing-body">
<div class="landing-breakout cols">
<div class="col-3-wide">
-
- <div class="framed-wear-square">
- <img src="{@docRoot}wear/images/screens/reservation_animated.gif">
+ <div class="framed-wear-square">
+ <img src="{@docRoot}wear/images/notifications.png" itemprop="image" alt="">
</div>
-
- <p class="landing-small">
- Say “Ok Google” to ask questions and get stuff done.
- </p>
- </div>
- <div class="col-3-wide">
- <img src="{@docRoot}wear/images/screens/circle_message2.png" itemprop="image" alt="">
+ <br />
<p class="landing-small">
Get glanceable, actionable information at just the right time with notifications
that are synced from your handheld device.
-
</p>
</div>
<div class="col-3-wide">
- <img src="{@docRoot}wear/images/screens/fitness-24.png" alt="">
+ <div class="framed-wear-square">
+ <img src="{@docRoot}wear/images/voicecommands.png">
+ </div>
+ <br />
+ <p class="landing-small">
+ Say “Ok Google” to send messages, ask questions, and get stuff done.
+ </p>
+ </div>
+ <div class="col-3-wide">
+ <div class="framed-wear-square">
+ <img src="{@docRoot}wear/images/steps.png" alt="">
+ </div>
+ <br />
<p class="landing-small">
Design apps that can access a wide range of sensors and other hardware
directly on the wearable.
-
</p>
</div>
</div>
-
<p>
Before you start building, check out the
<a href="{@docRoot}design/wear/index.html">Android Wear Design Principles</a>
@@ -126,7 +128,7 @@
<div class="landing-subhead">
The Android Wear APIs are delivered in the Android Support Library and Google Play
services. When using these libraries, handheld devices running Android 4.3
- (API Level 18) or later can communicate with wearables.</div>
+ or later can communicate with wearables.</div>
</div>
<div class="landing-body">
@@ -166,7 +168,7 @@
</div>
<div class="col-4">
<img src="{@docRoot}wear/images/features/send-data.png" alt="">
- <p>Synced Data</p>
+ <p>Send Data</p>
<p class="landing-small">
Send data and actions between handhelds and wearables with
data replication APIs and RPCs.
