diff options
| author | 2010-06-14 14:44:17 -0700 | |
|---|---|---|
| committer | 2010-06-14 14:44:17 -0700 | |
| commit | c465f9c4003c5d1806954f81c50e6f9d56adecc4 (patch) | |
| tree | eeefaec6e1b2f66175b0e0d6a587c35848c9721c | |
| parent | 40287c8f11860c67802360b806898e9bf77ab627 (diff) | |
| parent | 13792057e4fef30c9b6fe2b8249b246841508164 (diff) | |
am 13792057: am 7e900cbf: Merge "Update build version information." into gingerbread
Merge commit '13792057e4fef30c9b6fe2b8249b246841508164'
* commit '13792057e4fef30c9b6fe2b8249b246841508164':
Update build version information.
| -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 bfe916a0911e..04579403daee 100644 --- a/api/current.xml +++ b/api/current.xml @@ -120490,17 +120490,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 9d1a6347cd4f..fdd3573b5e26 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; } |