Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 78b94de4: Set KITKAT_WATCH to be level 20, document API specific changes.

Browse Source 
* commit '78b94de4b527c26bb3c038ae4f8cc351b3b4881f':
  Set KITKAT_WATCH to be level 20, document API specific changes.
This commit is contained in:
Justin Koh
2014-05-13 23:24:33 +00:00
committed by Android Git Automerger
parent 72a4c15c49 78b94de4b5
commit 32c5f2998f
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -17507,7 +17507,7 @@ package android.os {
field public static final int JELLY_BEAN_MR1 = 17; // 0x11 field public static final int JELLY_BEAN_MR1 = 17; // 0x11
field public static final int JELLY_BEAN_MR2 = 18; // 0x12 field public static final int JELLY_BEAN_MR2 = 18; // 0x12
field public static final int KITKAT = 19; // 0x13 field public static final int KITKAT = 19; // 0x13
field public static final int KITKAT_WATCH = 10000; // 0x2710 field public static final int KITKAT_WATCH = 20; // 0x14
} }
public final class Bundle implements java.lang.Cloneable android.os.Parcelable { public final class Bundle implements java.lang.Cloneable android.os.Parcelable {

11
core/java/android/os/Build.java
View File

@@ -502,9 +502,16 @@ public class Build {
public static final int KITKAT = 19; public static final int KITKAT = 19;
/** /**
* Android 4.5: KitKat for watches, snacks on the run. * Android 4.4W: KitKat for watches, snacks on the run.
*
* <p>Applications targeting this or a later release will get these
* new changes in behavior:</p>
* <ul>
* <li>{@link android.app.AlertDialog} might not have a default background if the theme does
* not specify one.</li>
* </ul>
*/ */
public static final int KITKAT_WATCH = CUR_DEVELOPMENT; // STOPSHIP: update API level public static final int KITKAT_WATCH = 20;
} }
/** The type of build, like "user" or "eng". */ /** The type of build, like "user" or "eng". */