From b8cabe9ae0b848ace8f6b20a9ecbf6c78a7643cb Mon Sep 17 00:00:00 2001 From: Robert Ly Date: Sun, 15 Jun 2014 13:04:43 -0700 Subject: fix the index page Change-Id: I84461a7ace1c6bde8e99534096cc9e485cecb4c4 --- docs/html/auto/index.jd | 1 + docs/html/index.jd | 51 ++++++++++++++------- docs/html/jd_tag_helpers.js | 1 + docs/html/preview/index.jd | 3 +- docs/html/preview/material/index.jd | 4 +- docs/html/preview/setup-devices.jd | 89 ++++++++++++++++++++++--------------- docs/html/preview/setup-sdk.jd | 30 +++++++------ docs/html/tv/index.jd | 3 +- docs/html/wear/index.jd | 49 +++++++++----------- 9 files changed, 130 insertions(+), 101 deletions(-) (limited to 'docs/html') diff --git a/docs/html/auto/index.jd b/docs/html/auto/index.jd index 2a527b365e8c..63772e2acfea 100644 --- a/docs/html/auto/index.jd +++ b/docs/html/auto/index.jd @@ -2,6 +2,7 @@ page.title=Android Auto 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 6394b73eae7f..c10fcdd597b1 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -7,23 +7,35 @@ page.customHeadTag= -
- -
+ +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
Get the SDK
+
Sample Code
+
Videos
+
Developer Console
+
+
+
-
-
-
-
Download SDK
-
Get Started
-
Sample Code
-
Videos
-
Developer Console
-
-
-
@@ -33,12 +45,18 @@ data-cardsizes="18x12,6x2, 6x2, 6x2" data-maxresults="4">
Android, Everywhere You Need It
Android runs on hundreds of millions of handheld devices around the world,
and it now supports these exciting, new form-factors. +
+ + +
+ +
@@ -78,6 +96,5 @@ data-cardsizes="18x12,6x2, 6x2, 6x2" data-maxresults="4">
- \ No newline at end of file diff --git a/docs/html/jd_tag_helpers.js b/docs/html/jd_tag_helpers.js index ca0138643e2d..b0fe67a49796 100644 --- a/docs/html/jd_tag_helpers.js +++ b/docs/html/jd_tag_helpers.js @@ -7,6 +7,7 @@ function mergeArrays() { } 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 3b5a4f822a2f..84a2d85a6d83 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 e54ba08f188c..468e4bd9d6dd 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 - -

The Android L Developer Preview includes support for material design apps. Material design +

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 material design specification and use the new components and functionality diff --git a/docs/html/preview/setup-devices.jd b/docs/html/preview/setup-devices.jd index 9ffe9f4cb2bc..065468503411 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 -

The Android 5.0 developer preview provides you with 32-bit system images +

The Android L developer preview provides you with 32-bit system images to flash the following devices:

@@ -15,8 +14,9 @@ to flash the following devices: experimental 64-bit system images along with standard 32-bit system images.

-

Flashing Devices

+

Installing the L Preview System Image

+

Warning: 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 @@ Android system image is not subject to the same testing as the factory OS and can cause your phone and installed services and applications to stop working.

-

-Click through Terms of Service: -https://docs.google.com/a/google.com/document/d/1OixnM1Q890ExOzDB3Z-FDD6Sb2kF4uZQiMxsYVII8F0/edit?usp=sharing +

+L +Preview Terms of Service

-

To the Developer Preview

+
  1. Download and extract the Android Developer Preview package to a directory - referred to as <extracted_images>.
    2. -
  2. 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 <l_download_dir> in these + instructions).
    3. +
  3. Connect your powered-off Android device to your development machine. Put + the device in fastboot mode by pressing and holding the following buttons:
      -
    • For Nexus 5: vol down + vol up + power
      • -
    • For Nexus 7: vol down + power
      • +
    • Nexus 5: volume down + volume up + + power
      • +
    • Nexus 7: volume down + power
    -

    Alternatively, run adb reboot bootloader - with USB debugging turned on to enter fastboot mode. - The device must be booted up if you’re using this method.

    +

    Alternatively, you can enter fastboot mode by booting up + the device and running adb reboot bootloader with USB debugging + turned on.

  4. Follow the instructions at - developers.google.com/android + developers.google.com/android to set up your system for flashing devices.
    5. -
  5. Run the <extracted-images>/flash-all script +
  6. Run the <l_download_dir>/flash-all script corresponding to your platform. This script flashes all of the system data - onto the phone.
    7. -
  7. (Optional) After flashing is complete, run fastboot oem lock - 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 fastboot oem - unlock, which wipes your device. We recommend you leave the + onto the phone.
    8. +
  8. (Optional) After flashing is complete, lock your device's bootloader by + putting it in fastboot mode and running fastboot oem lock. + (This does not wipe your device.) Once you do this, you will not be able to + flash your device until you run run fastboot oem unlock, + which unlocks the bootloader and wipes your device. We recommend you leave the bootloader unlocked until you are done with flashing the device.
-

To factory specifications

+

Reverting a Device to Factory Specifications

-

Go to developers.google.com/android - and download the image you want to flash to for your device. - Follow the instructions there to flash the image to your device.

+

If you want to uninstall the L Preview and revert the device to factory +specifications, go to developers.google.com/android 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.

Setting up an AVD

-You can set up Android Virtual Devices (AVD) and use the emulator to -build and test apps with: + +

You can set up Android Virtual Devices +(AVD) and use the emulator to build and test apps with the L Preview.

+ +

To create an AVD with the AVD Manager:

    -
  1. -
  2. -
  3. -
  4. -
  5. -
  6. -
  7. -
  8. -
\ No newline at end of file +
  • Install the L Preview SDK in your development environment, as described + in Setting Up the Preview + SDK.
    • +
  • Follow the steps in + Managing AVDs with AVD + Manager. Use the following settings: + + +
    • + + diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd index e0ef40dc9222..32a33b6337a1 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 -

    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 -Building Your First App training lesson first.

    +

    The Preview SDK is available from the Android SDK Manager. +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 Building Your First +App training lesson first.

    Download the SDK

    1. Start the Android SDK Manager.
      2. -
    2. In the Tools section, select the latest Android SDK Tools, Platform-tools, and Build-tools.
      3. -
    3. Select everything under the Android L Developer Preview section and click Install packages...
      4. -
    4. Accept the Licensing Agreement for all of the packages and click Install.
      5. +
    5. In the Tools section, select the latest Android SDK Tools, + Platform-tools, and Build-tools.
      6. + +
    6. Select everything under the Android L Developer Preview section and + click Install packages...
      7. +
    7. Accept the Licensing Agreement for all of the packages and click + Install.

    Set up your environment

    1. Create a new Android project with the following properties: -
      +
      • Minimum SDK Version: L
      • Target SDK Version: L
      • Build Target: L
        • -
      +
      2. -
    2. Set the theme for your app to use Theme.Material -
    3. etc
      4. -
    +
  • Choose the theme Theme.Material + + diff --git a/docs/html/tv/index.jd b/docs/html/tv/index.jd index 3ced60df9212..04274690a03e 100644 --- a/docs/html/tv/index.jd +++ b/docs/html/tv/index.jd @@ -2,6 +2,7 @@ heropage.title=Android TV page.viewport_width=970 fullpage=true no_footer_links=true +page.type=about @jd:body @@ -34,8 +35,6 @@ no_footer_links=true - -
    diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd index 6aa04a514d89..4c56cf2e521e 100644 --- a/docs/html/wear/index.jd +++ b/docs/html/wear/index.jd @@ -2,6 +2,7 @@ page.title=Android Wear page.viewport_width=970 fullpage=true no_footer_links=true +page.type=about @jd:body @@ -41,10 +42,11 @@ no_footer_links=true
    Information that moves with you
    -

    - Useful information when you need it most.
    - Intelligent answers to spoken questions.
    - Tools to help reach fitness goals.
    + +

    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.

    @@ -52,29 +54,6 @@ no_footer_links=true Get Started -
    @@ -97,6 +76,7 @@ $("#icon-video-close").on("click", function() {
    Android Wear extends the Android platform to a new generation of devices,
    with a user experience that's designed specifically for wearables. +
    @@ -118,6 +98,7 @@ $("#icon-video-close").on("click", function() {

    Get glanceable, actionable information at just the right time with notifications that are synced from your handheld device. +

    @@ -125,6 +106,7 @@ $("#icon-video-close").on("click", function() {

    Design apps that can access a wide range of sensors and other hardware directly on the wearable. +

    @@ -170,6 +152,7 @@ $("#icon-video-close").on("click", function() {

    Create wearable apps +

    @@ -181,6 +164,7 @@ $("#icon-video-close").on("click", function() {

    Work with the Data Layer +

    @@ -198,7 +182,11 @@ $("#icon-video-close").on("click", function() {
    +<<<<<<< HEAD
    Get Started with Android Wear
    +

    Set up your development environment and start working with the APIs. @@ -296,6 +286,7 @@ $("#icon-video-close").on("click", function() {

    Read more about Android Wear development on our blog. Just search for "Android Wear". +


    @@ -312,6 +303,7 @@ $("#icon-video-close").on("click", function() {

    G+ Community

    Follow us on Google+ to stay up-to-date with Android Wear development and to join the discussion! +

    +Android Wear Developers @@ -340,6 +332,5 @@ $("#icon-video-close").on("click", function() { License.

    +
    - -
    \ No newline at end of file -- cgit v1.2.3-59-g8ed1b