am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev

* commit '22c298a5df7a9fa53826ecfa4925372b1eebf8bc':
  KLP/KitKat is now API 19.
This commit is contained in:
Dianne Hackborn
2013-10-03 15:39:44 -07:00
committed by Android Git Automerger
4 changed files with 40 additions and 30 deletions

View File

@@ -17849,7 +17849,7 @@ package android.os {
field public static final int JELLY_BEAN = 16; // 0x10
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 KITKAT = 10000; // 0x2710
field public static final int KITKAT = 19; // 0x13
}
public final class Bundle implements java.lang.Cloneable android.os.Parcelable {

View File

@@ -1657,9 +1657,8 @@ public abstract class Context {
* Request that a given application service be started. The Intent
* should contain either contain the complete class name of a specific service
* implementation to start or a specific package name to target. If the
* Intent is less specified, it will either throw an {@link IllegalArgumentException}
* (if the caller targets {@link android.os.Build.VERSION_CODES#KITKAT} or later),
* or which of multiple matching services it finds and uses will be undefined. If this service
* Intent is less specified, it log a warning about this and which of the
* multiple matching services it finds and uses will be undefined. If this service
* is not already running, it will be instantiated and started (creating a
* process for it if needed); if it is running then it remains running.
*

View File

@@ -438,17 +438,28 @@ public class Build {
public static final int JELLY_BEAN_MR2 = 18;
/**
* Android X.X: KitKat, another tasty treat.
* Android 4.4: KitKat, another tasty treat.
*
* <p>Applications targeting this or a later release will get these
* new changes in behavior:</p>
* <ul>
* <li>It is no longer allowed to use implicit intents with
* {@link android.content.Context#startService} or
* {@link android.content.Context#bindService}.
* <li> The default result of {android.preference.PreferenceActivity#isValidFragment
* PreferenceActivity.isValueFragment} becomes false instead of true.</li>
* <li> In {@link android.webkit.WebView}, apps targeting earlier versions will have
* JS URLs evaluated directly and any result of the evaluation will not replace
* the current page content. Apps targetting KITKAT or later that load a JS URL will
* have the result of that URL replace the content of the current page</li>
* <li> {@link android.app.AlarmManager#set AlarmManager.set} becomes interpreted as
* an inexact value, to give the system more flexibility in scheduling alarms.</li>
* <li> {@link android.content.Context#getSharedPreferences(String, int)
* Context.getSharedPreferences} no longer allows a null name.</li>
* <li> {@link android.widget.RelativeLayout} changes to compute wrapped content
* margins correctly.</li>
* <li> {@link android.app.ActionBar}'s window content overlay is allowed to be
* drawn.</li>
* </ul>
*/
public static final int KITKAT = CUR_DEVELOPMENT;
public static final int KITKAT = 19;
}
/** The type of build, like "user" or "eng". */

View File

@@ -2054,29 +2054,29 @@
<public type="style" name="Theme.DeviceDefault.Light.NoActionBar.Overscan" id="0x010301e0" />
<!-- ===============================================================
Resources added in version 19 of the platform
Resources added in version 19 of the platform (KitKat)
=============================================================== -->
<eat-comment />
<public type="attr" name="keySet" />
<public type="attr" name="targetId" />
<public type="attr" name="fromScene" />
<public type="attr" name="toScene" />
<public type="attr" name="transition" />
<public type="attr" name="transitionOrdering" />
<public type="attr" name="fadingMode" />
<public type="attr" name="startDelay" />
<public type="attr" name="ssp" />
<public type="attr" name="sspPrefix" />
<public type="attr" name="sspPattern" />
<public type="attr" name="addPrintersActivity" />
<public type="attr" name="vendor" />
<public type="attr" name="category" />
<public type="attr" name="isAsciiCapable" />
<public type="attr" name="autoMirrored" />
<public type="attr" name="supportsSwitchingToNextInputMethod" />
<public type="attr" name="requireDeviceUnlock" />
<public type="attr" name="apduServiceBanner" />
<public type="attr" name="accessibilityLiveRegion" />
<public type="attr" name="keySet" id="0x010103db" />
<public type="attr" name="targetId" id="0x010103dc" />
<public type="attr" name="fromScene" id="0x010103dd" />
<public type="attr" name="toScene" id="0x010103de" />
<public type="attr" name="transition" id="0x010103df" />
<public type="attr" name="transitionOrdering" id="0x010103e0" />
<public type="attr" name="fadingMode" id="0x010103e1" />
<public type="attr" name="startDelay" id="0x010103e2" />
<public type="attr" name="ssp" id="0x010103e3" />
<public type="attr" name="sspPrefix" id="0x010103e4" />
<public type="attr" name="sspPattern" id="0x010103e5" />
<public type="attr" name="addPrintersActivity" id="0x010103e6" />
<public type="attr" name="vendor" id="0x010103e7" />
<public type="attr" name="category" id="0x010103e8" />
<public type="attr" name="isAsciiCapable" id="0x010103e9" />
<public type="attr" name="autoMirrored" id="0x010103ea" />
<public type="attr" name="supportsSwitchingToNextInputMethod" id="0x010103eb" />
<public type="attr" name="requireDeviceUnlock" id="0x010103ec" />
<public type="attr" name="apduServiceBanner" id="0x010103ed" />
<public type="attr" name="accessibilityLiveRegion" id="0x010103ee" />
</resources>