Doc change: updates for preview content.
Change-Id: Ife06f0e5b3ef6950d5d6fe452940c8dd87ed89ea
diff --git a/docs/html-ndk/ndk/index.jd b/docs/html-ndk/ndk/index.jd
index 6723ed7..3ab95c8 100644
--- a/docs/html-ndk/ndk/index.jd
+++ b/docs/html-ndk/ndk/index.jd
@@ -43,9 +43,10 @@
<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
<h2 class="norule">Latest</h2>
<div class="resource-widget resource-flow-layout col-16"
- data-query="type:blog+tag:featured+tag:preview"
+ data-query="type:blog+tag:ndk"
data-cardSizes="6x6"
- data-maxResults="3"></div>
+ data-maxResults="6"
+ data-initial-results="3"></div>
</div></section>
<section class="dac-section dac-light"><div class="wrap">
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index 4ba0b09..7c56a69 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -58,7 +58,8 @@
<div class="resource-widget resource-flow-layout col-16"
data-query="collection:develop/landing/latest"
data-cardSizes="6x6"
- data-maxResults="3"></div>
+ data-maxResults="9"
+ data-initial-results="3"></div>
</div></section>
<section class="dac-section dac-light"><div class="wrap">
@@ -125,5 +126,6 @@
data-query="collection:develop/landing/courses"
data-sortOrder="random"
data-cardSizes="6x6"
- data-maxResults="6"></div>
+ data-initial-results="6"
+ data-maxResults="12"></div>
</div></section>
diff --git a/docs/html/distribute/googleplay/cast.jd b/docs/html/distribute/googleplay/cast.jd
index 55bc1a9..339142e 100644
--- a/docs/html/distribute/googleplay/cast.jd
+++ b/docs/html/distribute/googleplay/cast.jd
@@ -1,4 +1,4 @@
-page.title=Stream with Google Cast
+page.title=Stream Your Content with Google Cast
page.metaDescription=Let users stream your video and audio content to their TVs and speakers.
page.tags=cast, video, chromecast
@jd:body
diff --git a/docs/html/distribute/index.jd b/docs/html/distribute/index.jd
index d3f3836..c8928df 100644
--- a/docs/html/distribute/index.jd
+++ b/docs/html/distribute/index.jd
@@ -22,7 +22,8 @@
data-query="type:youtube+tag:googleplay+tag:developerstory+tag:featured, type:blog+tag:googleplay+tag:distribute+tag:featured"
data-sortOrder="-timestamp"
data-cardSizes="6x6"
- data-maxResults="3"></div>
+ data-maxResults="12"
+ data-initial-results="3"></div>
</div></section>
<section class="dac-section dac-invert dac-darken-bg" style="background-image: url(/images/distribute/google-play-bg.jpg)"><div class="wrap">
diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd
index e7a5167..8538161 100644
--- a/docs/html/google/index.jd
+++ b/docs/html/google/index.jd
@@ -11,7 +11,7 @@
<div class="wrap">
<div class="cols dac-hero-content">
<div class="col-1of2 col-push-1of2 dac-hero-figure">
- <img class="dac-hero-image" src="/design/media/hero-material-design.png">
+ <img class="dac-hero-image" src="/images/google/hero-play-services_2x.png">
</div>
<div class="col-1of2 col-pull-1of2">
<h1 class="dac-hero-title">Build better apps with Google</h1>
@@ -44,7 +44,8 @@
<div class="resource-widget resource-flow-layout col-16"
data-query="type:blog+tag:googleservices+tag:featured+tag:develop"
data-cardSizes="6x6"
- data-maxResults="3"></div>
+ data-maxResults="9"
+ data-initial-results="3"></div>
</div>
</section>
diff --git a/docs/html/images/cards/card-api-overview_16-9_2x.png b/docs/html/images/cards/card-api-overview_16-9_2x.png
new file mode 100644
index 0000000..8ee4c27
--- /dev/null
+++ b/docs/html/images/cards/card-api-overview_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-preview_16-9_2x.png b/docs/html/images/cards/card-preview_16-9_2x.png
index dd80f6a..e790c9d 100644
--- a/docs/html/images/cards/card-preview_16-9_2x.png
+++ b/docs/html/images/cards/card-preview_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-samples_16-9_2x.png b/docs/html/images/cards/card-samples_16-9_2x.png
new file mode 100644
index 0000000..39d50a6
--- /dev/null
+++ b/docs/html/images/cards/card-samples_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-set-up_16-9_2x.png b/docs/html/images/cards/card-set-up_16-9_2x.png
index 0283801..460e13b 100644
--- a/docs/html/images/cards/card-set-up_16-9_2x.png
+++ b/docs/html/images/cards/card-set-up_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-support_16-9_2x.png b/docs/html/images/cards/card-support_16-9_2x.png
index 08b3290..7f6e1f9 100644
--- a/docs/html/images/cards/card-support_16-9_2x.png
+++ b/docs/html/images/cards/card-support_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/course-nanodegree-lg_2x.jpg b/docs/html/images/cards/course-nanodegree-lg_2x.jpg
deleted file mode 100644
index c32769b..0000000
--- a/docs/html/images/cards/course-nanodegree-lg_2x.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/cards/course-nanodegree_2x.jpg b/docs/html/images/cards/course-nanodegree_2x.jpg
deleted file mode 100644
index db3702b..0000000
--- a/docs/html/images/cards/course-nanodegree_2x.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/cards/course-nanodegree_2x.png b/docs/html/images/cards/course-nanodegree_2x.png
new file mode 100644
index 0000000..8f99703
--- /dev/null
+++ b/docs/html/images/cards/course-nanodegree_2x.png
Binary files differ
diff --git a/docs/html/images/cards/course-ud825.png b/docs/html/images/cards/course-ud825_2x.png
similarity index 100%
rename from docs/html/images/cards/course-ud825.png
rename to docs/html/images/cards/course-ud825_2x.png
Binary files differ
diff --git a/docs/html/images/cards/course-ud849.jpg b/docs/html/images/cards/course-ud849_2x.jpg
similarity index 100%
rename from docs/html/images/cards/course-ud849.jpg
rename to docs/html/images/cards/course-ud849_2x.jpg
Binary files differ
diff --git a/docs/html/images/cards/course-ud853.jpg b/docs/html/images/cards/course-ud853_2x.jpg
similarity index 100%
rename from docs/html/images/cards/course-ud853.jpg
rename to docs/html/images/cards/course-ud853_2x.jpg
Binary files differ
diff --git a/docs/html/images/google/hero-play-services_2x.png b/docs/html/images/google/hero-play-services_2x.png
new file mode 100644
index 0000000..118e7a7
--- /dev/null
+++ b/docs/html/images/google/hero-play-services_2x.png
Binary files differ
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 70274eb..7fae38a 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -7,9 +7,11 @@
<!-- <div class="dac-hero-carousel" data-carousel-query="collection:index/carousel">
</div> -->
+<section class="dac-hero-carousel">
-<article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);">
-<a class="dac-hero-carousel-action" href="{@docRoot}preview/index.html">
+<!-- <article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);"> -->
+<article class="dac-expand dac-hero dac-invert active" style="background-color: #455A64;">
+<a href="/preview/index.html">
<div class="wrap" style="max-width:1100px;">
<div class="cols dac-hero-content">
<div class="col-10of16 col-push-6of16 dac-hero-figure">
@@ -30,7 +32,7 @@
</div>
</div>
</a>
-</article>
+</article></section>
<div class="actions-bar dac-expand dac-invert">
<div class="wrap dac-offset-parent">
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index 421f87a..050bf10 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -1383,11 +1383,15 @@
"title": "",
"resources": [
"preview/overview.html",
- "preview/api-overview.html",
+ "preview/download.html",
"preview/setup-sdk.html",
"preview/samples.html",
- "preview/reference.html",
- "preview/support.html"
+ "preview/support.html",
+ "preview/api-overview.html",
+ "preview/features/runtime-permissions.html",
+ "preview/api-changes.html",
+ "preview/api-overview.html",
+ "preview/backup/index.html",
]
},
"autolanding": {
diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index 6f6d31d..eb9639d 100644
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -2623,7 +2623,7 @@
"group":"",
"keywords": ["mobile","ux","design"],
"tags": ["courses"],
- "image":"images/cards/course-ud849.jpg",
+ "image":"images/cards/course-ud849_2x.jpg",
"lang":"en",
"type":"online course"
},
@@ -2635,7 +2635,7 @@
"group":"",
"keywords": ["start","firstapp","sdk"],
"tags": ["courses"],
- "image":"images/cards/course-ud853.jpg",
+ "image":"images/cards/course-ud853_2x.jpg",
"lang":"en",
"type":"online course"
},
@@ -2647,19 +2647,19 @@
"group":"",
"keywords": ["performance","battery"],
"tags": ["courses"],
- "image":"images/cards/course-ud825.png",
+ "image":"images/cards/course-ud825_2x.png",
"lang":"en",
"type":"online course"
},
{
"title":"Enroll in the Android Nanodegree",
"titleFriendly":"",
- "summary":"Sign up to learn about Android and receive a certification of your efforts.",
- "url":"https://www.udacity.com/android-nanodegree",
+ "summary":"Enroll in the Android Nanodegree to build the skills to work as an Android developer.",
+ "url":"https://www.udacity.com/android",
"group":"",
"keywords": ["nanodegree"],
"tags": ["courses"],
- "image":"images/cards/course-nanodegree-lg.jpg",
+ "image":"images/cards/course-nanodegree_2x.png",
"lang":"en",
"type":"online course"
},
@@ -2671,7 +2671,7 @@
"group":"",
"keywords": ["android, experts"],
"tags": ["courses"],
- "image":"images/cards/course-ud855.jpg",
+ "image":"images/cards/course-ud855_2x.jpg",
"lang":"en",
"type":"online course"
},
@@ -2683,7 +2683,7 @@
"group":"",
"keywords": ["wear, tv, auto"],
"tags": ["courses"],
- "image":"images/cards/course-ud875.jpg",
+ "image":"images/cards/course-ud875_2x.jpg",
"lang":"en",
"type":"online course"
},
@@ -2695,7 +2695,7 @@
"group":"",
"keywords": ["google, play services, google services"],
"tags": ["courses"],
- "image":"images/cards/course-ud876.jpg",
+ "image":"images/cards/course-ud876_2x.jpg",
"lang":"en",
"type":"online course"
},
@@ -2707,7 +2707,7 @@
"group":"",
"keywords": ["design, pure, material"],
"tags": ["courses"],
- "image":"images/cards/course-ud862.jpg",
+ "image":"images/cards/course-ud862_2x.jpg",
"lang":"en",
"type":"online course"
},
@@ -2719,7 +2719,7 @@
"group":"",
"keywords": ["firstapp",],
"tags": ["courses"],
- "image":"images/cards/course-ud837.jpg",
+ "image":"images/cards/course-ud837_2x.jpg",
"lang":"en",
"type":"online course"
},
@@ -2731,7 +2731,7 @@
"group":"",
"keywords": ["gradle","studio", "sdk"],
"tags": ["courses"],
- "image":"images/cards/course-ud867.jpg",
+ "image":"images/cards/course-ud867_2x.jpg",
"lang":"en",
"type":"online course"
},
diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd
index da7b5ea..b1f14ac 100644
--- a/docs/html/preview/index.jd
+++ b/docs/html/preview/index.jd
@@ -7,35 +7,32 @@
footer.hide=1
@jd:body
-<section class="dac-expand dac-hero dac-light" style="background-repeat:no-repeat">
- <div class="wrap">
+<section class="dac-expand dac-hero dac-light" >
+ <div class="wrap" style="max-width:1100px">
<div class="cols dac-hero-content">
<div class="col-9of16 col-push-7of16 dac-hero-figure">
- <img class="dac-hero-image" src="{@docRoot}images/home/devices-hero_620px_2x.png">
+ <img class="dac-hero-image" src="/images/home/devices-hero_620px_2x.png">
</div>
- <div class="col-7of16 col-pull-9of16">
+ <div class="col-6of16 col-pull-8of16">
<h1 class="dac-hero-title">Android M Developer Preview</h1>
<p class="dac-hero-description">
Get ready for the next version of Android. Test your apps on Nexus 5, 6, 9, and
- Player. Explore what's new — a runtime permissions model, power saving Volta features, and new assist technology.
+ Player. Explore what's new — a <strong>runtime permissions</strong> model,
+ power-saving <strong>Volta features</strong>, new <strong>assist technology</strong>,
+ and more.
</p>
- <a class="dac-hero-cta" href="{@docRoot}preview/overview.html">
+ <a class="dac-hero-cta" href="/preview/overview.html">
<span class="dac-sprite dac-auto-chevron"></span>
Get Started!
</a><br>
</div>
</div>
- <div class="dac-section dac-small">
- <div class="resource-widget resource-flow-layout col-16"
- data-query="collection:preview/landing/resources"
- data-cardSizes="6x2"
- data-maxResults="3"></div>
- </div>
- </div>
+
</section>
+
<div class="wrap dac-offset-parent">
<a class="dac-fab dac-scroll-button" data-scroll-button href="#latest">
<i class="dac-sprite dac-arrow-down-gray"></i>
@@ -43,9 +40,34 @@
</div>
<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
+ <h2 class="norule">Resources</h2>
+<div class="dac-section dac-small">
+ <div class="resource-widget resource-flow-layout col-16"
+ data-query="collection:preview/landing/resources"
+ data-cardSizes="6x2"
+ data-maxResults="6"></div>
+ </div>
+ </div></section>
+
+
+
+<section class="dac-section dac-section-light" id="build-apps"><div class="wrap">
+ <h1 class="dac-section-title">Get your apps ready</h1>
+ <div class="dac-section-subtitle">
+ Resources to help you learn about Android M and get your app ready.
+ </div>
+ <div class="resource-widget resource-flow-layout col-16"
+ data-query="collection:preview/landing/resources"
+ data-cardSizes="6x6"
+ data-maxResults="6"></div>
+</div></section>
+
+
+<section class="dac-section dac-gray dac-small dac-invert" id="latest"><div class="wrap">
<h2 class="norule">Latest</h2>
<div class="resource-widget resource-flow-layout col-16"
- data-query="type:blog+tag:featured+tag:preview"
+ data-query="type:blog+tag:featured"
data-cardSizes="6x6"
- data-maxResults="3"></div>
+ data-maxResults="6"
+ data-initial-results="3"</div>
</div></section>
diff --git a/docs/html/training/index.jd b/docs/html/training/index.jd
index c39ea54..862e185 100644
--- a/docs/html/training/index.jd
+++ b/docs/html/training/index.jd
@@ -15,8 +15,8 @@
<div>
<div style="float:left; width:40%; margin-right:30px">
- <p>If you think you might prefer to learn the basics through interactive video training,
- check out this trailer for a course in the fundamentals of Android development.</p>
+ <p>If you prefer to learn through interactive video training,
+ check out this trailer for a course about the fundamentals of Android development.</p>
<p><a href="https://www.udacity.com/course/ud853" class="button">
Start the video course</a></p>
</div>
@@ -26,4 +26,16 @@
</div>
</div>
-<div style="clear:left"></div>
\ No newline at end of file
+<div style="clear:left"></div>
+
+ <div><h2 class="norule">Online video courses</h2>
+ <p>If you prefer to learn through interactive video training,
+ check out these free courses.</p>
+ <div class="resource-widget resource-flow-layout col-16"
+ data-query="collection:develop/landing/courses"
+ data-sortOrder="random"
+ data-cardSizes="6x6"
+ data-maxResults="9"
+ data-initial-results="3"></div>
+</div>
+</div>
\ No newline at end of file
