From a43c4777931f1fdbe59d8d06a3c1d399cdeca4e5 Mon Sep 17 00:00:00 2001 From: Dirk Dougherty Date: Sun, 26 Jun 2011 17:14:12 -0700 Subject: [PATCH] Cherrypick from honeycomb-mr2: Doc change: add HC MR2 version notes and update api level info. --- docs/html/guide/appendix/api-levels.jd | 79 ++- docs/html/sdk/android-3.1.jd | 6 +- docs/html/sdk/android-3.2.jd | 737 +++++++++++++++++++++++++ docs/html/sdk/sdk_toc.cs | 8 + 4 files changed, 813 insertions(+), 17 deletions(-) create mode 100644 docs/html/sdk/android-3.2.jd diff --git a/docs/html/guide/appendix/api-levels.jd b/docs/html/guide/appendix/api-levels.jd index 5c18a83d1df63..7a0e17fff7d13 100644 --- a/docs/html/guide/appendix/api-levels.jd +++ b/docs/html/guide/appendix/api-levels.jd @@ -82,20 +82,71 @@ API Level 1 and subsequent releases have incremented the API Level.

Android platform.

- - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Platform VersionAPI Level
Android 3.112
Android 3.011
Android 2.3.410
Android 2.3.3
Android 2.39
Android 2.28
Android 2.17
Android 2.0.16
Android 2.05
Android 1.64
Android 1.53
Android 1.12
Android 1.01
Platform VersionAPI LevelVERSION_CODENotes
Android 3.213{@link android.os.Build.VERSION_CODES#HONEYCOMB_MR2}
Android 3.1.x12{@link android.os.Build.VERSION_CODES#HONEYCOMB_MR1}Platform Highlights
Android 3.0.x11{@link android.os.Build.VERSION_CODES#HONEYCOMB}Platform Highlights
Android 2.3.4
Android 2.3.3		10{@link android.os.Build.VERSION_CODES#GINGERBREAD_MR1}Platform Highlights
Android 2.3.2
Android 2.3.1
Android 2.3		9{@link android.os.Build.VERSION_CODES#GINGERBREAD}
Android 2.2.x8{@link android.os.Build.VERSION_CODES#FROYO}Platform Highlights
Android 2.1.x7{@link android.os.Build.VERSION_CODES#ECLAIR_MR1}Platform Highlights
Android 2.0.16{@link android.os.Build.VERSION_CODES#ECLAIR_0_1}
Android 2.05{@link android.os.Build.VERSION_CODES#ECLAIR}
Android 1.64{@link android.os.Build.VERSION_CODES#DONUT}Platform Highlights
Android 1.53{@link android.os.Build.VERSION_CODES#CUPCAKE}Platform Highlights
Android 1.12{@link android.os.Build.VERSION_CODES#BASE_1_1}
Android 1.01{@link android.os.Build.VERSION_CODES#BASE}
diff --git a/docs/html/sdk/android-3.1.jd b/docs/html/sdk/android-3.1.jd index 992b7d16e1c88..161472285cb01 100644 --- a/docs/html/sdk/android-3.1.jd +++ b/docs/html/sdk/android-3.1.jd @@ -19,14 +19,14 @@ sdk.platform.apiLevel=12

Reference

  1. API +href="{@docRoot}sdk/api_diff/12/changes.html">API Differences Report »

See Also

  1. Optimizing -Apps for Android 3.0
    2. +Apps for Android 3.x
@@ -765,7 +765,7 @@ was upgraded while it was in started state (not in a stopped state).

-

Core utilities

+

Core utilities