diff --git a/docs/html/index.jd b/docs/html/index.jd index eef7929dbbd5f..609d78a338993 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -22,15 +22,16 @@ page.customHeadTag=Android 6.0 Marshmallow
-

Final SDK is now available! Get your apps ready for the next version - of Android. Test on Nexus 5, 6, 9, and Player.

+

The official Android 6.0 + SDK is now available! Update to Developer Preview 3 + and get your apps ready for Android Marshmallow!

Get started
- + Update to Developer Preview 3 (final SDK) diff --git a/docs/html/preview/download.jd b/docs/html/preview/download.jd index 99a880ff8ae77..de99d0d84ca0f 100644 --- a/docs/html/preview/download.jd +++ b/docs/html/preview/download.jd @@ -184,13 +184,13 @@ This is the Android SDK Preview License Agreement (the “License Agreement”).

-

Developer Preview 3 SDK

+

Android 6.0 SDK

- The Preview SDK is available for download through the Android SDK Manager. For more information on - downloading and configuring the Preview SDK, see Set Up the Preview SDK. + downloading and configuring the SDK, see Set Up the SDK.

diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd index 5410e4fb5ae4b..db9a957e0faf4 100644 --- a/docs/html/preview/index.jd +++ b/docs/html/preview/index.jd @@ -18,8 +18,8 @@ footer.hide=1

Android M Developer Preview

- Final SDK is now available! - Get ready for the next version of Android. Test your apps on Nexus 5, 6, 9, and + The official Android 6.0 SDK is now available! + Get your apps ready for the next version of Android. Test on Nexus 5, 6, 9, and Player. Explore what's new — runtime permissions, Doze and App Standby power-saving features, new assist technology, and more. diff --git a/docs/html/preview/overview.jd b/docs/html/preview/overview.jd index 97935928d0081..1e814565adacb 100644 --- a/docs/html/preview/overview.jd +++ b/docs/html/preview/overview.jd @@ -160,18 +160,18 @@ page.tags="preview", "developer", "android"

  • - Preview 2 (available). + Preview 2 (available).
  • - Preview 3 (final APIs and SDK, now available). + Preview 3 (final APIs and official Android 6.0 SDK, available).
  • - These updates culminate in the final SDK (available now), - which delivers the official APIs for the new version of Android, as well - as the final system behaviors and features. + These updates culminate in the official Android 6.0 SDK (now available), + which lets you build with the final APIs for the new version of Android, as well as + near-final system images to let you test system behaviors and features.

    @@ -216,7 +216,7 @@ page.tags="preview", "developer", "android"

    - Android M Developer Preview 3 is the final incremental update + Developer Preview 3 is the final incremental update to the Android M preview platform that was originally released in May 2015. - The update includes final APIs and final SDK, as well as - near-final system images for testing your apps. The - updated system images include a variety of fixes and enhancements across + The update includes final APIs and the official Android 6.0 SDK, + as well as near-final system images for testing your apps. The + updated system images bring a variety of fixes and enhancements across the system, including those related to issues reported by developers through the external issue tracker.

    If you are currently developing or testing on Android M, you should update - your environment to Developer Preview 3 as soon as possible, so that - you can begin final compatibility testing in preparation for the public - release to device manufacturers.

    + your environment as soon as possible, so that + you can begin final compatibility testing in preparation for + the public release to device manufacturers later this year.

    -

    Updating to Developer Preview 3 ensures that - you are building against final platform APIs and testing against - the final behaviors. If you are just getting started with the Android - M Developer Preview SDK, follow the instructions in Set up the Preview SDK, then update your - environment for Developer Preview 3. +

    Updating to the Android 6.0 SDK and the latest + system images 3 ensures that you are building against final + platform APIs in API level 23 and testing + against final behaviors. If you are just getting started, + follow the instructions in Set up the Preview SDK.

    @@ -95,15 +95,16 @@ page.image=images/cards/card-support_16-9_2x.png

    - Developer Preview 3 includes an updated SDK and system images, - documentation, and samples for developing against the final Android M + Developer Preview 3 includes the official Android 6.0 + SDK as well as updated preview system images, documentation, + and samples for developing against the Android 6.0 development platform.

    @@ -198,8 +196,8 @@ page.image=images/cards/card-support_16-9_2x.png

    - You can download the Developer Preview 3 final SDK platform and - emulator images from the SDK Manager. + You can download the official Android 6.0 SDK platform and + Developer Preview 3 emulator images from the SDK Manager.

    @@ -211,23 +209,15 @@ page.image=images/cards/card-support_16-9_2x.png

    - If you are just getting started with Android M Developer Preview and want - to receive Developer Preview 3 via OTA, download the - Developer Preview 2 - system image, and flash it to your device. Then, - leave the device powered on for several hours. It registers with the - OTA service, and receives Developer Preview 3 by OTA. -

    - -

    - For instructions on how to download and flash your device to the Developer + For instructions on how to download and flash your device to the latest Developer Preview, see the links and instructions on the Downloads page.

    - For instructions on how to start developing and testing with Android M, read - Setting up the SDK. + For instructions on how to start developing and testing with Android 6.0 + Marshmallow, read Setting + up the SDK.