Doc change: adjustments for design updates.
Change-Id: Ic798228a75ba2ab692fd3e36034606c04651c20c
diff --git a/docs/html/about/about_toc.cs b/docs/html/about/about_toc.cs
index eb59b12..a456012 100644
--- a/docs/html/about/about_toc.cs
+++ b/docs/html/about/about_toc.cs
@@ -1,6 +1,5 @@
<ul id="nav">
-
- <li class="nav-section">
+ <li class="nav-section">
<div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/marshmallow/index.html">
<span class="en">Marshmallow</span></a></div>
<ul>
@@ -10,7 +9,6 @@
Android 6.0 Changes</a></li>
<li><a href="<?cs var:toroot ?>about/versions/marshmallow/samples.html">
Android 6.0 Samples</a></li>
- </li>
</ul>
</li>
<li class="nav-section">
diff --git a/docs/html/about/android.jd b/docs/html/about/android.jd
index ad0ea7c..e3b6958 100644
--- a/docs/html/about/android.jd
+++ b/docs/html/about/android.jd
@@ -26,7 +26,7 @@
<blockquote>Every day more than a million new Android devices are activated worldwide.</blockquote>
<p>Android’s openness has made it a favorite for consumers and developers alike,
-driving strong growth in app consumption. Android users download more than
+driving strong growth in app consumption. Android users download
billions of apps and games from Google Play each month. </p>
<p>With its partners, Android is continuously pushing the boundaries of hardware and software
@@ -76,7 +76,7 @@
packaging Android apps. Using the IDE, you can develop on any available Android
device or create virtual devices that emulate any hardware configuration.</p>
-<blockquote>1.5 billion downloads a month and growing. Get your apps in front
+<blockquote>Billion downloads a month and growing. Get your apps in front
of millions of users at Google's scale.</blockquote>
<h3>Open marketplace for distributing your apps</h3>
@@ -107,5 +107,5 @@
the best apps promotional slots in curated collections.
</p>
-<p>Preinstalled on hundreds of billions of Android devices around the world,
+<p>Preinstalled on billions of Android devices around the world,
Google Play can be a growth engine for your business.</p>
\ No newline at end of file
diff --git a/docs/html/about/dashboards/index.jd b/docs/html/about/dashboards/index.jd
index 9274d5d..471dc07 100644
--- a/docs/html/about/dashboards/index.jd
+++ b/docs/html/about/dashboards/index.jd
@@ -1,7 +1,9 @@
page.title=Dashboards
-page.metaDescription=page.metaDescription=Charts that give you an overview of device characteristics and platform versions that are active in the Android ecosystem.
+page.metaDescription=page.metaDescription=An overview of device characteristics and platform versions that are active in the Android ecosystem.
page.tags="android, dashboard, platforms, versions"
-meta.tags="ecosystem, versions, whatsnew"
+meta.tags="ecosystem, versions, whatsnew, dashboards"
+page.image=http://chart.googleapis.com/chart?chl=GL%201.1%20only%7CGL%202.0%7CGL%203.0&chf=bg%2Cs%2C00000000&chd=t%3A0.1%2C93.5%2C6.4&chco=c4df9b%2C6fad0c&chs=400x250&cht=p
+
@jd:body
<style>
diff --git a/docs/html/about/index.jd b/docs/html/about/index.jd
index 215fc3c..22f504e 100644
--- a/docs/html/about/index.jd
+++ b/docs/html/about/index.jd
@@ -119,40 +119,4 @@
<p>Preinstalled on hundreds of millions of Android devices around the world,
Google Play can be a growth engine for your business.</p>
-<p><a class="landing-page-link" href="{@docRoot}about/start.html">GET STARTED</a></p>
-
-<div style="background: #F0F0F0;
- border-top: 1px solid #DDD;
- padding: 20px 0 24px 0;
- overflow: auto;
- clear:both;
- margin-bottom:-10px;
- margin-top:60px;"">
- <div style="padding:0 0 0 29px;">
- <h4>Developer Story: Robot Invader</h4>
- <img alt="" class="screenshot thumbnail" style="-webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px height:78px;
- width: 78px;
- float: left;
- margin: 17px 20px 9px 0;" src=
- "//g0.gstatic.com/android/market/com.robotinvader.knightmare/hi-256-0-9e08d83bc8d01649e167131d197ada1cd1783fb0">
- <div style="width:700px;">
- <p style="margin-top:26px;margin-bottom:12px;">Robot Invader chose
- Android as the launch platform for their first game,
- <a data-g-event="Developers Page" data-g-label="Case Study Link" href=
- "//play.google.com/store/apps/details?id=com.robotinvader.knightmare"><em>Wind-up
- Knight</em></a>.
- </p>
- <p>
- Hear from the developers themselves how Android helped them reach more
- than 100 devices with a single app binary, then iterate rapidly to ensure
- a great experience for users.
- </p>
- </div>
- <iframe style="float:left;
- margin-right:24px;
- margin-top:14px;" width="700" height="394" src=
- "http://www.youtube.com/embed/hTtlLiUTowY" frameborder="0" allowfullscreen></iframe>
- </div>
-</div>
\ No newline at end of file
+<p><a class="landing-page-link" href="{@docRoot}about/start.html">GET STARTED</a></p>
\ No newline at end of file
diff --git a/docs/html/about/versions/kitkat.jd b/docs/html/about/versions/kitkat.jd
index dff3508..2987bd4 100644
--- a/docs/html/about/versions/kitkat.jd
+++ b/docs/html/about/versions/kitkat.jd
@@ -58,11 +58,10 @@
<img src="{@docRoot}images/kk-devices.png" alt="Android 4.4 on phone and tablet" width="380">
</div>
- <div class="landing-docs" style="float:right;clear:both;margin:22px 0 2em 3em;">
- <div class="col-4 normal-links highlights" style="font-size:12px;">
- <h3 id="thisd" >Key Developer Features</h3>
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2 id="features" >Key Developer Features</h3>
<ul style="list-style-type:none;">
- <!--<li><a href="#44-ui">UI refresh</a></li>-->
<li><a href="#44-hce">Host Card Emulation</a></li>
<li><a href="#44-printing">Printing framework</a></li>
<li><a href="#44-storage-access">Storage access framework</a></li>
diff --git a/docs/html/about/versions/marshmallow/index.jd b/docs/html/about/versions/marshmallow/index.jd
index a7bca56..35edd72 100644
--- a/docs/html/about/versions/marshmallow/index.jd
+++ b/docs/html/about/versions/marshmallow/index.jd
@@ -2,7 +2,8 @@
page.tags="marshmallow"
meta.tags="marshamallow","android60"
fullpage=true
-section.landing=true
+nonavpage=true
+forcelocalnav=true
header.hide=1
footer.hide=1
@jd:body
@@ -55,6 +56,7 @@
<div class="resource-widget resource-flow-layout col-16"
data-query="collection:marshmallow/landing/more"
data-cardSizes="6x6"
+ data-items-per-page="15"
data-initial-results="3"></div>
</div>
</section>
@@ -68,17 +70,19 @@
<div class="resource-widget resource-flow-layout col-16"
data-query="collection:marshmallow/landing/videos"
data-cardSizes="6x6"
+ data-items-per-page="15"
data-initial-results="6"></div>
</div>
</section>
-<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
+<section class="dac-section dac-gray dac-small" id="latest"><div class="wrap">
<h2 class="norule">Latest</h2>
<div class="resource-widget resource-flow-layout col-16"
data-query="type:blog+tag:marshmallow"
data-sortOrder="-timestamp"
data-cardSizes="6x6"
- data-maxResults="12"
+ data-maxResults="24"
+ data-items-per-page="15"
data-initial-results="3">
</div>
</section>