am 13792057: am 7e900cbf: Merge "Update build version information." into gingerbread

Merge commit '13792057e4fef30c9b6fe2b8249b246841508164'

* commit '13792057e4fef30c9b6fe2b8249b246841508164':
  Update build version information.
This commit is contained in:
Dianne Hackborn
2010-06-14 14:44:17 -07:00
committed by Android Git Automerger
2 changed files with 14 additions and 13 deletions

View File

@ -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"

View File

@ -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;
}