diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-06-14 14:10:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-14 14:10:43 -0700 |
| commit | 7e900cbf1d600a8895e63a0247f45c116ff05172 (patch) | |
| tree | fa0e3f022d0980c0e7808fea4d25f5b87eba8997 | |
| parent | dca66e1c3bc8842b0d44e0cb004e507a456e4b8f (diff) | |
| parent | 3e03cfa3af8acf3aad0abc464d2bcab1225a971d (diff) | |
| download | frameworks_base-7e900cbf1d600a8895e63a0247f45c116ff05172.zip frameworks_base-7e900cbf1d600a8895e63a0247f45c116ff05172.tar.gz frameworks_base-7e900cbf1d600a8895e63a0247f45c116ff05172.tar.bz2 | |
Merge "Update build version information." into gingerbread
| -rw-r--r-- | api/current.xml | 11 | ||||
| -rw-r--r-- | core/java/android/os/Build.java | 16 |
2 files changed, 14 insertions, 13 deletions
diff --git a/api/current.xml b/api/current.xml index 41b0423..53319e4 100644 --- a/api/current.xml +++ b/api/current.xml @@ -117454,17 +117454,6 @@ visibility="public" > </field> -<field name="KRAKEN" - type="int" - transient="false" - volatile="false" - value="10000" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> </class> <class name="Bundle" extends="java.lang.Object" diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 9d1a634..fdd3573 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -179,10 +179,22 @@ public class Build { */ public static final int ECLAIR_MR1 = 7; + /** + * June 2010: Android 2.2 + */ public static final int FROYO = 8; - public static final int KRAKEN = CUR_DEVELOPMENT; - + /** + * Next version of Android. + * + * <p>Applications targeting this or a later release will get these + * new changes in behavior:</p> + * <ul> + * <li> The status bar is now dark. Targeting this version allows + * the platform to perform performing compatibility on status bar + * graphics to ensure they look okay on a dark background. + * </ul> + */ public static final int GINGERBREAD = CUR_DEVELOPMENT; } |