fix the index page
Change-Id: I84461a7ace1c6bde8e99534096cc9e485cecb4c4
diff --git a/docs/html/auto/index.jd b/docs/html/auto/index.jd
index 2a527b3..63772e2 100644
--- a/docs/html/auto/index.jd
+++ b/docs/html/auto/index.jd
@@ -2,6 +2,7 @@
page.viewport_width=970
fullpage=true
no_footer_links=true
+page.type=about
@jd:body
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 6394b73..c10fcdd 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -7,23 +7,35 @@
@jd:body
-<div class="wrap">
- <div style="margin-top:40px" class="resource-widget resource-flow-layout col-16" data-query="collection:launch/static" data-sortorder=""
-data-cardsizes="18x12,6x2, 6x2, 6x2" data-maxresults="4"></div>
-</div>
-<div style="height:30px"></div>
+<!-- Top full-bleed carousel -->
+<div class="home-new-carousel-1">
+ <div class="fullscreen-carousel-content">
+ <div class="vcenter">
+ <div class="wrap clearfix">
+ <div class="resource-widget resource-flow-layout wrap col-16"
+ data-query="collection:launch/static"
+ data-resourceStyle="card"
+ data-sortOrder="-timestamp"
+ data-numStacks="3"
+ data-maxResults="4"
+ data-cardSizes="18x6,6x2,6x2,6x2">
+ </div> <!-- end .resource-widget -->
+ </div> <!-- end .wrap -->
+ </div> <!-- end .vcenter -->
+ </div> <!-- end .fullscreen-carousel-content -->
+</div> <!-- end .fullscreen-carousel -->
- <div style="margin-top:600px" class="actions-bar">
- <div class="wrap">
- <div class="actions">
- <div><a href="http://developer.android.com/sdk/index.html">Download SDK</a></div>
- <div><a href="http://developer.android.com/about/start.html">Get Started</a></div>
- <div><a href="http://developer.android.com/samples/index.html">Sample Code</a></div>
- <div><a href="http://developer.android.com/design/videos/index.html">Videos</a></div>
- <div><a href="https://developer.android.com/distribute/googleplay/developer-console.html">Developer Console</a></div>
- </div><!-- end .actions -->
- </div><!-- end .wrap -->
- </div><!-- end .actions-bar -->
+<div class="actions-bar">
+ <div class="wrap">
+ <div class="actions">
+ <div><a href="http://developer.android.com/sdk/index.html">Get the SDK</a></div>
+ <div><a href="http://developer.android.com/samples/index.html">Sample Code</a></div>
+ <div><a href="http://developer.android.com/design/videos/index.html">Videos</a></div>
+ <div><a href="https://developer.android.com/distribute/googleplay/developer-console.html">Developer Console</a></div>
+ </div><!-- end .actions -->
+ </div><!-- end .wrap -->
+</div><!-- end .actions-bar -->
+
<div class="landing-rest-of-page">
@@ -33,12 +45,18 @@
<div class="landing-h1">Android, Everywhere You Need It</div>
<div class="landing-subhead">
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">
<div class="landing-breakout cols">
+<!--<div class="resource-widget resource-flow-layout col-16" data-query="collection:index/devices" data-sortorder="" data-cardsizes="6x2, 6x2, 6x2" data-maxresults="3"></div>-->
+
<div class="col-3-wide">
<img src="{@docRoot}tv/images/placeholder-square.png" alt="">
@@ -78,6 +96,5 @@
</div>
</div>
-
</div> <!-- end .wrap -->
</div> <!-- end .landing-section -->
\ No newline at end of file
diff --git a/docs/html/jd_tag_helpers.js b/docs/html/jd_tag_helpers.js
index ca01386..b0fe67a 100644
--- a/docs/html/jd_tag_helpers.js
+++ b/docs/html/jd_tag_helpers.js
@@ -7,6 +7,7 @@
}
var ALL_RESOURCES = mergeArrays(
+ ABOUT_RESOURCES,
DESIGN_RESOURCES,
DISTRIBUTE_RESOURCES,
GOOGLE_RESOURCES,
diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd
index 3b5a4f8..84a2d85 100644
--- a/docs/html/preview/index.jd
+++ b/docs/html/preview/index.jd
@@ -1,7 +1,8 @@
-heropage.title=Android L Developer Preview
+page.title=Android L Developer Preview
page.viewport_width=970
fullpage=true
no_footer_links=true
+page.type=about
@jd:body
diff --git a/docs/html/preview/material/index.jd b/docs/html/preview/material/index.jd
index e54ba08..468e4bd 100644
--- a/docs/html/preview/material/index.jd
+++ b/docs/html/preview/material/index.jd
@@ -1,9 +1,9 @@
page.title=Material Design
+page.type=design
@jd:body
-
-<p>The Android L Developer Preview includes support for material design apps. Material design
+<p itemprop="description">The Android L Developer Preview includes support for material design apps. Material design
is a comprehensive guide for visual, motion, and interaction design across platforms and devices.
To use material design in your Android apps, follow the guidelines defined in the
<a href="">material design specification</a> and use the new components and functionality
diff --git a/docs/html/preview/setup-devices.jd b/docs/html/preview/setup-devices.jd
index 9ffe9f4..0654685 100644
--- a/docs/html/preview/setup-devices.jd
+++ b/docs/html/preview/setup-devices.jd
@@ -1,8 +1,7 @@
page.title=Setting Up Hardware and AVDs
-
@jd:body
-<p>The Android 5.0 developer preview provides you with 32-bit system images
+<p>The Android L developer preview provides you with 32-bit system images
to flash the following devices:
</p>
@@ -15,8 +14,9 @@
experimental 64-bit system images along with standard 32-bit system images.
</p>
-<h2>Flashing Devices</h2>
+<h2>Installing the L Preview System Image</h2>
+<!-- Will we get an official warning text from the lawyercats? Is this it? -->
<p class="warning"><b>Warning</b>: This is a preview version of the Android
system image, and is subject to change. Your use of this system image is
governed by the Android SDK Preview License Agreement. The Android preview
@@ -26,56 +26,71 @@
can cause your phone and installed services and applications to stop working.
</p>
-<p>
-Click through Terms of Service:
-https://docs.google.com/a/google.com/document/d/1OixnM1Q890ExOzDB3Z-FDD6Sb2kF4uZQiMxsYVII8F0/edit?usp=sharing
+<p><!-- Will this link change before we publish (to a clean version of the doc)?
+ Or will we scrub the doc's comments & revision history? -->
+<a href="https://docs.google.com/a/google.com/document/d/1OixnM1Q890ExOzDB3Z-FDD6Sb2kF4uZQiMxsYVII8F0/edit?usp=sharing">L
+Preview Terms of Service</a>
</p>
-<h3>To the Developer Preview</h3>
+
<ol>
<li>Download and extract the Android Developer Preview package to a directory
- referred to as <code><extracted_images></code>.</li>
- <li>Connect your powered-off Android device to your development machine and
- press and hold the following buttons until your device is in fastboot mode:
+ (which we'll call <code><l_download_dir></code> in these
+ instructions).</li>
+ <li>Connect your powered-off Android device to your development machine. Put
+ the device in fastboot mode by pressing and holding the following buttons:
<ul>
- <li>For Nexus 5: vol down + vol up + power</li>
- <li>For Nexus 7: vol down + power </li>
+ <li><strong>Nexus 5:</strong> <i>volume down</i> + <i>volume up</i> +
+ <i>power</i></li>
+ <li><strong>Nexus 7:</strong> <i>volume down</i> + <i>power</i> </li>
</ul>
- <p class="note">Alternatively, run <code>adb reboot bootloader</code>
- with USB debugging turned on to enter fastboot mode.
- The device must be booted up if you’re using this method.</p>
+ <p class="note">Alternatively, you can enter fastboot mode by booting up
+ the device and running <code>adb reboot bootloader</code> with USB debugging
+ turned on.</p>
</li>
<li>Follow the instructions at
- <a href="https://developers.google.com/android/nexus/images">developers.google.com/android</a>
+ <a href="https://developers.google.com/android/nexus/images#instructions">developers.google.com/android</a>
to set up your system for flashing devices.</li>
- <li>Run the <code><extracted-images>/flash-all</code> script
+ <li>Run the <code><l_download_dir>/flash-all</code> script
corresponding to your platform. This script flashes all of the system data
- onto the phone.</li>
- <li>(Optional) After flashing is complete, run <code>fastboot oem lock</code>
- with the device in fastboot mode to lock it again. This does not wipe your
- device, but if you want to flash again, you need to run <code>fastboot oem
- unlock</code>, which wipes your device. We recommend you leave the
+ onto the phone.</li> <!-- Confirm names of flash scripts -->
+ <li>(Optional) After flashing is complete, lock your device's bootloader by
+ putting it in fastboot mode and running <code>fastboot oem lock</code>.
+ (This does not wipe your device.) Once you do this, you will not be able to
+ flash your device until you run run <code>fastboot oem unlock</code>,
+ which unlocks the bootloader and wipes your device. We recommend you leave the
bootloader unlocked until you are done with flashing the device.</li>
</ol>
-<h3>To factory specifications</h3>
+<h3>Reverting a Device to Factory Specifications</h3>
- <p>Go to <a href="http://developers.google.com/android/nexus/images">developers.google.com/android</a>
- and download the image you want to flash to for your device.
- Follow the instructions there to flash the image to your device.</p>
+ <p>If you want to uninstall the L Preview and revert the device to factory
+specifications, go to <a href="http://developers.google.com/android
+/nexus/images">developers.google.com/android</a> and download the image you want
+to flash to for your device. Follow the instructions on that page to flash the
+image to your device.</p>
<h2>Setting up an AVD</h2>
-You can set up Android Virtual Devices (AVD) and use the emulator to
-build and test apps with:
+
+<p>You can set up <a href="{@docRoot}tools/devices/">Android Virtual Devices
+(AVD)</a> and use the emulator to build and test apps with the L Preview.</p>
+
+<p>To create an AVD with the AVD Manager:</p>
<ol>
- <li></li>
- <li></li>
- <li></li>
- <li></li>
- <li></li>
- <li></li>
- <li></li>
- <li></li>
-</ol>
\ No newline at end of file
+ <li>Install the L Preview SDK in your development environment, as described
+ in <a href="{@docRoot}preview/setup-sdk.html">Setting Up the Preview
+ SDK.</a></li>
+ <li>Follow the steps in
+ <a href="{@docRoot}tools/devices/managing-avds.html">Managing AVDs with AVD
+ Manager</a>. Use the following settings:
+ <ul>
+ <li><b>Device:</b> Either Nexus 5 or Nexus 7</li>
+ <li><b>Target:</b> <!-- Confirm exact text when we have final distro -->
+ Android L (Preview) - API Level L</li>
+ </ul>
+ <!-- Confirm this works when you can download image through SDK manager! -->
+ </li>
+</ol>
+
diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd
index e0ef40d..32a33b6 100644
--- a/docs/html/preview/setup-sdk.jd
+++ b/docs/html/preview/setup-sdk.jd
@@ -1,32 +1,36 @@
page.title=Setting Up the Preview SDK
-
@jd:body
-<p>The Preview SDK is available from the Android SDK Manager. This document assumes that you
-are familiar with Android Development, such as using the Android SDK Manager and creating
-projects. If you're new to Android, see
-<a href="{@docRoot}training/basics/firstapp/index.html">Building Your First App</a> training lesson first.</a></p>
+<p>The Preview SDK is available from the Android SDK Manager. <!-- Not yet! -->
+This document assumes that you are familiar with Android app development, such
+as using the Android SDK Manager and creating projects. If you're new to
+Android, see <a href="/training/basics/firstapp/index.html">Building Your First
+App</a> training lesson first.</a></p>
<h2>Download the SDK</h2>
<ol>
<li>Start the Android SDK Manager.</li>
- <li>In the <b>Tools</b> section, select the latest Android <b>SDK Tools</b>, <b>Platform-tools</b>, and <b>Build-tools</b>.</li>
- <li>Select everything under the <b>Android L Developer Preview</b> section and click <b>Install packages...</b></li>
- <li>Accept the Licensing Agreement for all of the packages and click <b>Install</b>.</li>
+ <li>In the <b>Tools</b> section, select the latest Android <b>SDK Tools</b>,
+ <b>Platform-tools</b>, and <b>Build-tools</b>.</li>
+ <!-- Android L not yet showing up in Android SDK Manager... -->
+ <li>Select everything under the <b>Android L Developer Preview</b> section and
+ click <b>Install packages...</b></li>
+ <li>Accept the Licensing Agreement for all of the packages and click
+ <b>Install</b>.</li>
</ol>
<h2>Set up your environment</h2>
<ol>
<li>Create a new Android project with the following properties:
- <dl>
+ <ul>
<li>Minimum SDK Version: L</li>
<li>Target SDK Version: L</li>
<li>Build Target: L</li>
- </dl>
+ </ul>
</li>
- <li>Set the theme for your app to use <code>Theme.Material</code>
- <li>etc</li>
-</ol>
+ <li>Choose the theme <code>Theme.Material</code>
+ <!-- put in name as it appears in Eclipse menu? -->
+</ol>
diff --git a/docs/html/tv/index.jd b/docs/html/tv/index.jd
index 3ced60d..0427469 100644
--- a/docs/html/tv/index.jd
+++ b/docs/html/tv/index.jd
@@ -2,6 +2,7 @@
page.viewport_width=970
fullpage=true
no_footer_links=true
+page.type=about
@jd:body
@@ -34,8 +35,6 @@
</div>
</div>
-
-
<div class="landing-body-content">
<div class="landing-hero-container">
diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd
index 6aa04a5..4c56cf2 100644
--- a/docs/html/wear/index.jd
+++ b/docs/html/wear/index.jd
@@ -2,6 +2,7 @@
page.viewport_width=970
fullpage=true
no_footer_links=true
+page.type=about
@jd:body
@@ -41,10 +42,11 @@
<div class="landing-subhead hero">Information that moves with you</div>
</div>
<div class="landing-hero-description">
- <p>
- Useful information when you need it most.<br />
- Intelligent answers to spoken questions.<br />
- Tools to help reach fitness goals.<br />
+
+ <p>Small, powerful devices, worn on the body.
+ Useful information when you need it most.
+ Intelligent answers to spoken questions.
+ Tools to help reach fitness goals.
Your key to a multiscreen world.</p>
</div>
@@ -52,29 +54,6 @@
<a href="/training/wearables/index.html" class="landing-button landing-primary" style="margin-top: 40px;">
Get Started
</a>
-<script>
-$("#watchVideo").on("click", function(e) {
- $("#video-container").fadeIn(400, function(){$("#video-frame").show()});
-
- var params = { allowScriptAccess: "always"};
- var atts = { id: "ytapiplayer" };
- swfobject.embedSWF("//www.youtube.com/v/0xQ3y902DEQ?enablejsapi=1&playerapiid=ytplayer&version=3&HD=1;rel=0;showinfo=0;modestbranding;origin=developer.android.com;autohide=1;autoplay=1",
- "ytapiplayer", "940", "526.4", "8", null, null, params, atts);
-
- e.preventDefault();
-});
-$("#icon-video-close").on("click", function() {
- ytplayer = document.getElementById("ytapiplayer");
- try {
- ytplayer.stopVideo();
- $(ytplayer).hide();
- $("#video-container").fadeOut(400);
- } catch(e) {
- console.log('Video not available');
- $("#video-container").fadeOut(400);
- }
-});
-</script>
</div>
</div>
@@ -97,6 +76,7 @@
<div class="landing-subhead">
Android Wear extends the Android platform to a new generation of devices, <br>
with a user experience that's designed specifically for wearables.
+
</div>
</div>
@@ -118,6 +98,7 @@
<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">
@@ -125,6 +106,7 @@
<p class="landing-small">
Design apps that can access a wide range of sensors and other hardware
directly on the wearable.
+
</p>
</div>
</div>
@@ -170,6 +152,7 @@
</p>
<p class="landing-small">
<a href="/training/wearables/apps/index.html/">Create wearable apps</a>
+
</p>
</div>
<div class="col-4">
@@ -181,6 +164,7 @@
</p>
<p class="landing-small">
<a href="/training/wearables/apps/index.html/">Work with the Data Layer</a>
+
</p>
</div>
<div class="col-4">
@@ -198,7 +182,11 @@
</div>
</div> <!-- end .wrap -->
</div> <!-- end .landing-section -->
+<<<<<<< HEAD
<!--
+=======
+
+>>>>>>> add page.types to various pages for dynamic content
<div class="landing-section landing-white-background">
<div class="wrap">
<div class="landing-section-header">
@@ -246,12 +234,14 @@
</div>
</div>
</div> <!-- end .wrap
+
</div> <!-- end .landing-section -->
<div class="landing-section landing-red-background">
<div class="wrap">
<div class="landing-section-header">
<div class="landing-h1 landing-align-left">Get Started with Android Wear</div>
+
<div class="landing-subhead landing-subhead-red">
<p>
Set up your development environment and start working with the APIs.
@@ -296,6 +286,7 @@
<p class="landing-small">
Read more about Android Wear development
on our blog. Just search for "Android Wear".
+
</p>
<br>
<p class="landing-small">
@@ -312,6 +303,7 @@
<p>G+ Community</p>
<p class="landing-small">
Follow us on Google+ to stay up-to-date with Android Wear development and to join the discussion!
+
</p>
<p class="landing-small">
<a target="_blank" href="http://g.co/androidweardev">+Android Wear Developers</a>
@@ -340,6 +332,5 @@
License</a>.
</div>
</div>
+ </div> <!-- end landing-body-content -->
-
- </div> <!-- end landing-body-content -->
\ No newline at end of file