From e8222dddaf2e3da14380101e818d4254899e0c0d Mon Sep 17 00:00:00 2001 From: Chet Haase Date: Thu, 5 Sep 2013 07:44:18 -0700 Subject: [PATCH] Change build version from KEY_LIME_PIE to KITKAT Issue #10631619 Change build version to KitKat Change-Id: I6ad13f6169ad74204078d36929479998b498ad8b --- api/current.txt | 2 +- core/java/android/app/AlarmManager.java | 2 +- core/java/android/app/ContextImpl.java | 8 ++++---- core/java/android/content/Context.java | 14 +++++++------- core/java/android/os/Build.java | 4 ++-- core/java/android/os/Environment.java | 3 +-- .../android/preference/PreferenceActivity.java | 2 +- core/java/android/provider/Settings.java | 2 +- core/java/android/view/View.java | 2 +- core/java/android/view/ViewParent.java | 2 +- core/java/android/webkit/WebView.java | 2 +- core/java/android/widget/ListView.java | 8 ++++---- core/java/android/widget/RelativeLayout.java | 6 +++--- .../internal/widget/ActionBarOverlayLayout.java | 5 ++--- graphics/java/android/graphics/Bitmap.java | 6 +++--- graphics/java/android/graphics/BitmapFactory.java | 4 ++-- 16 files changed, 35 insertions(+), 37 deletions(-) diff --git a/api/current.txt b/api/current.txt index be870e743fead..715533a216567 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17651,7 +17651,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 KEY_LIME_PIE = 10000; // 0x2710 + field public static final int KITKAT = 10000; // 0x2710 } public final class Bundle implements java.lang.Cloneable android.os.Parcelable { diff --git a/core/java/android/app/AlarmManager.java b/core/java/android/app/AlarmManager.java index 1a568260996c9..5c3a3e5cde6c2 100644 --- a/core/java/android/app/AlarmManager.java +++ b/core/java/android/app/AlarmManager.java @@ -101,7 +101,7 @@ public class AlarmManager mService = service; final int sdkVersion = ctx.getApplicationInfo().targetSdkVersion; - mAlwaysExact = (sdkVersion < Build.VERSION_CODES.KEY_LIME_PIE); + mAlwaysExact = (sdkVersion < Build.VERSION_CODES.KITKAT); } private long legacyExactLength() { diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index f10290d2c3b89..5c49dd2b7039b 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -726,7 +726,7 @@ class ContextImpl extends Context { // name. This happened to work because when we generated the file name // we would stringify it to "null.xml". Nice. if (mPackageInfo.getApplicationInfo().targetSdkVersion < - Build.VERSION_CODES.KEY_LIME_PIE) { + Build.VERSION_CODES.KITKAT) { if (name == null) { name = "null"; } @@ -1453,7 +1453,7 @@ class ContextImpl extends Context { public ComponentName startServiceAsUser(Intent service, UserHandle user) { try { if (service.getComponent() == null && service.getPackage() == null) { - if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KEY_LIME_PIE) { + if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KITKAT) { IllegalArgumentException ex = new IllegalArgumentException( "Service Intent must be explicit: " + service); Log.e(TAG, "This will become an error", ex); @@ -1485,7 +1485,7 @@ class ContextImpl extends Context { public boolean stopServiceAsUser(Intent service, UserHandle user) { try { if (service.getComponent() == null && service.getPackage() == null) { - if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KEY_LIME_PIE) { + if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KITKAT) { IllegalArgumentException ex = new IllegalArgumentException( "Service Intent must be explicit: " + service); Log.e(TAG, "This will become an error", ex); @@ -1528,7 +1528,7 @@ class ContextImpl extends Context { throw new RuntimeException("Not supported in system context"); } if (service.getComponent() == null && service.getPackage() == null) { - if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KEY_LIME_PIE) { + if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KITKAT) { IllegalArgumentException ex = new IllegalArgumentException( "Service Intent must be explicit: " + service); Log.e(TAG, "This will become an error", ex); diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 2ff9182241efe..8df5bee57b86d 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -638,7 +638,7 @@ public abstract class Context { * {@sample development/samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java * private_picture} *

- * Starting in {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, no + * Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no * permissions are required for the owning application to read or write to * this path. Otherwise, {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} * or {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} are required. @@ -674,7 +674,7 @@ public abstract class Context { * the device, including both emulated external storage and physical media * slots. This does not include transient devices, such as USB flash drives. *

- * Starting in {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, no + * Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no * permissions are required for the owning application to read or write to * these paths. *

@@ -695,7 +695,7 @@ public abstract class Context { * should ensure that multiple instances running under different users don't * interfere with each other. *

- * Starting in {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, no + * Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no * permissions are required for the owning application to read or write to * this path. Otherwise, * {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} or @@ -713,7 +713,7 @@ public abstract class Context { * the device, including both emulated external storage and physical media * slots. This does not include transient devices, such as USB flash drives. *

- * Starting in {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, no + * Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no * permissions are required for the owning application to read or write to * this path. *

@@ -774,7 +774,7 @@ public abstract class Context { * each user has their own isolated external storage. Applications only * have access to the external storage for the user they're running as.

*

- * Starting in {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, no + * Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no * permissions are required for the owning application to read or write to * this path. Otherwise, * {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} or @@ -799,7 +799,7 @@ public abstract class Context { * the device, including both emulated external storage and physical media * slots. This does not include transient devices, such as USB flash drives. *

- * Starting in {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, no + * Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no * permissions are required for the owning application to read or write to * these paths. *

@@ -1651,7 +1651,7 @@ public abstract class Context { * 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#KEY_LIME_PIE} or later), + * (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 * 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. diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index dd40e3506303b..88eb280afb40c 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -438,7 +438,7 @@ public class Build { public static final int JELLY_BEAN_MR2 = 18; /** - * Android X.X: Key Lime Pie, another tasty treat. + * Android X.X: KitKat, another tasty treat. * *

Applications targeting this or a later release will get these * new changes in behavior:

@@ -448,7 +448,7 @@ public class Build { * {@link android.content.Context#bindService}. * */ - public static final int KEY_LIME_PIE = CUR_DEVELOPMENT; + public static final int KITKAT = CUR_DEVELOPMENT; } /** The type of build, like "user" or "eng". */ diff --git a/core/java/android/os/Environment.java b/core/java/android/os/Environment.java index 3b9456f79875d..c6e8c3e5b7be7 100644 --- a/core/java/android/os/Environment.java +++ b/core/java/android/os/Environment.java @@ -20,7 +20,6 @@ import android.content.Context; import android.os.storage.IMountService; import android.os.storage.StorageManager; import android.os.storage.StorageVolume; -import android.os.SystemProperties; import android.text.TextUtils; import android.util.Log; @@ -324,7 +323,7 @@ public class Environment { * {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} permission, * which is automatically granted if you hold the write permission. *

- * Starting in {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, if your + * Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, if your * application only needs to store internal data, consider using * {@link Context#getExternalFilesDir(String)} or * {@link Context#getExternalCacheDir()}, which require no permissions to diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index 0f765fa6ba4d3..5d886a3374afb 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -893,7 +893,7 @@ public abstract class PreferenceActivity extends ListActivity implements * @return true if the fragment class name is valid for this Activity and false otherwise. */ protected boolean isValidFragment(String fragmentName) { - if (getApplicationInfo().targetSdkVersion >= android.os.Build.VERSION_CODES.KEY_LIME_PIE) { + if (getApplicationInfo().targetSdkVersion >= android.os.Build.VERSION_CODES.KITKAT) { Log.w(TAG, "Subclasses of PreferenceActivity must override isValidFragment(String)" + " to verify that the Fragment class is valid! " + this.getClass().getName() + " has not checked if fragment " + fragmentName + " is valid."); diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index c3fcd6269cd0c..1a80818ff08f7 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -343,7 +343,7 @@ public final class Settings { /** * Activity Action: Show settings to manage the user input dictionary. *

- * Starting with {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, + * Starting with {@link android.os.Build.VERSION_CODES#KITKAT}, * it is guaranteed there will always be an appropriate implementation for this Intent action. * In prior releases of the platform this was optional, so ensure you safeguard against it. *

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index f2b3e8967aee8..ce9cdfa324d7b 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -8834,7 +8834,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * Change the view's z order in the tree, so it's on top of other sibling * views. This ordering change may affect layout, if the parent container * uses an order-dependent layout scheme (e.g., LinearLayout). Prior - * to {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE} this + * to {@link android.os.Build.VERSION_CODES#KITKAT} this * method should be followed by calls to {@link #requestLayout()} and * {@link View#invalidate()} on the view's parent to force the parent to redraw * with the new child ordering. diff --git a/core/java/android/view/ViewParent.java b/core/java/android/view/ViewParent.java index 656d7565df166..35113db607e89 100644 --- a/core/java/android/view/ViewParent.java +++ b/core/java/android/view/ViewParent.java @@ -149,7 +149,7 @@ public interface ViewParent { * Change the z order of the child so it's on top of all other children. * This ordering change may affect layout, if this container * uses an order-dependent layout scheme (e.g., LinearLayout). Prior - * to {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE} this + * to {@link android.os.Build.VERSION_CODES#KITKAT} this * method should be followed by calls to {@link #requestLayout()} and * {@link View#invalidate()} on this parent to force the parent to redraw * with the new child ordering. diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index f0e8c4ffe9d45..18403ebc1a38d 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -1070,7 +1070,7 @@ public class WebView extends AbsoluteLayout /** * Exports the contents of this Webview as PDF. Only supported for API levels - * {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE} and above. + * {@link android.os.Build.VERSION_CODES#KITKAT} and above. * * TODO(sgurun) the parameter list is stale. Fix it before unhiding. * diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index 941ddfce46829..389d9d64158e6 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -248,7 +248,7 @@ public class ListView extends AbsListView { *

* Note: When first introduced, this method could only be called before * setting the adapter with {@link #setAdapter(ListAdapter)}. Starting with - * {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, this method may be + * {@link android.os.Build.VERSION_CODES#KITKAT}, this method may be * called at any time. If the ListView's adapter does not extend * {@link HeaderViewListAdapter}, it will be wrapped with a supporting * instance of {@link WrapperListAdapter}. @@ -285,7 +285,7 @@ public class ListView extends AbsListView { *

* Note: When first introduced, this method could only be called before * setting the adapter with {@link #setAdapter(ListAdapter)}. Starting with - * {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, this method may be + * {@link android.os.Build.VERSION_CODES#KITKAT}, this method may be * called at any time. If the ListView's adapter does not extend * {@link HeaderViewListAdapter}, it will be wrapped with a supporting * instance of {@link WrapperListAdapter}. @@ -341,7 +341,7 @@ public class ListView extends AbsListView { *

* Note: When first introduced, this method could only be called before * setting the adapter with {@link #setAdapter(ListAdapter)}. Starting with - * {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, this method may be + * {@link android.os.Build.VERSION_CODES#KITKAT}, this method may be * called at any time. If the ListView's adapter does not extend * {@link HeaderViewListAdapter}, it will be wrapped with a supporting * instance of {@link WrapperListAdapter}. @@ -378,7 +378,7 @@ public class ListView extends AbsListView { *

* Note: When first introduced, this method could only be called before * setting the adapter with {@link #setAdapter(ListAdapter)}. Starting with - * {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, this method may be + * {@link android.os.Build.VERSION_CODES#KITKAT}, this method may be * called at any time. If the ListView's adapter does not extend * {@link HeaderViewListAdapter}, it will be wrapped with a supporting * instance of {@link WrapperListAdapter}. diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index b9b6b08f957ee..92c9b935f0ac2 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -477,13 +477,13 @@ public class RelativeLayout extends ViewGroup { if (isWrapContentWidth) { if (isLayoutRtl()) { - if (targetSdkVersion < Build.VERSION_CODES.KEY_LIME_PIE) { + if (targetSdkVersion < Build.VERSION_CODES.KITKAT) { width = Math.max(width, myWidth - params.mLeft); } else { width = Math.max(width, myWidth - params.mLeft - params.leftMargin); } } else { - if (targetSdkVersion < Build.VERSION_CODES.KEY_LIME_PIE) { + if (targetSdkVersion < Build.VERSION_CODES.KITKAT) { width = Math.max(width, params.mRight); } else { width = Math.max(width, params.mRight + params.rightMargin); @@ -492,7 +492,7 @@ public class RelativeLayout extends ViewGroup { } if (isWrapContentHeight) { - if (targetSdkVersion < Build.VERSION_CODES.KEY_LIME_PIE) { + if (targetSdkVersion < Build.VERSION_CODES.KITKAT) { height = Math.max(height, params.mBottom); } else { height = Math.max(height, params.mBottom + params.bottomMargin); diff --git a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java index 88ff7e28d7635..5469b635b5ae5 100644 --- a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java +++ b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java @@ -19,7 +19,6 @@ package com.android.internal.widget; import android.graphics.Canvas; import android.graphics.drawable.Drawable; import android.os.Build; -import android.util.Log; import android.view.ViewGroup; import com.android.internal.app.ActionBarImpl; @@ -85,7 +84,7 @@ public class ActionBarOverlayLayout extends ViewGroup { ta.recycle(); mIgnoreWindowContentOverlay = context.getApplicationInfo().targetSdkVersion < - Build.VERSION_CODES.KEY_LIME_PIE; + Build.VERSION_CODES.KITKAT; } public void setActionBar(ActionBarImpl impl) { @@ -111,7 +110,7 @@ public class ActionBarOverlayLayout extends ViewGroup { */ mIgnoreWindowContentOverlay = overlayMode && getContext().getApplicationInfo().targetSdkVersion < - Build.VERSION_CODES.KEY_LIME_PIE; + Build.VERSION_CODES.KITKAT; } public void setShowingForActionMode(boolean showing) { diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 495bbca716c7d..4c7395c7b98f2 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -420,7 +420,7 @@ public final class Bitmap implements Parcelable { * It is recommended to use {@link #ARGB_8888} instead of this * configuration. * - * Note: as of {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, + * Note: as of {@link android.os.Build.VERSION_CODES#KITKAT}, * any bitmap created with this configuration will be created * using {@link #ARGB_8888} instead. * @@ -1130,7 +1130,7 @@ public final class Bitmap implements Parcelable { * getPixels() or setPixels(), then the pixels are uniformly treated as * 32bit values, packed according to the Color class. * - *

As of {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, this method + *

As of {@link android.os.Build.VERSION_CODES#KITKAT}, this method * should not be used to calculate the memory usage of the bitmap. Instead, * see {@link #getAllocationByteCount()}. * @@ -1143,7 +1143,7 @@ public final class Bitmap implements Parcelable { /** * Returns the minimum number of bytes that can be used to store this bitmap's pixels. * - *

As of {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, the result of this method can + *

As of {@link android.os.Build.VERSION_CODES#KITKAT}, the result of this method can * no longer be used to determine memory usage of a bitmap. See {@link * #getAllocationByteCount()}.

*/ diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java index 8872de0ccdd6c..4193dbb324494 100644 --- a/graphics/java/android/graphics/BitmapFactory.java +++ b/graphics/java/android/graphics/BitmapFactory.java @@ -56,7 +56,7 @@ public class BitmapFactory { * mutable even when decoding a resource which would normally result in * an immutable bitmap.

* - *

As of {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, any + *

As of {@link android.os.Build.VERSION_CODES#KITKAT}, any * mutable bitmap can be reused to decode any other bitmaps as long as * the resulting {@link Bitmap#getByteCount() byte count} of the decoded * bitmap is less than or equal to the {@link @@ -64,7 +64,7 @@ public class BitmapFactory { * bitmap. This can be because the intrinsic size is smaller, or its * size post scaling (for density / sample size) is smaller.

* - *

Prior to {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE} + *

Prior to {@link android.os.Build.VERSION_CODES#KITKAT} * additional constraints apply: The image being decoded (whether as a * resource or as a stream) must be in jpeg or png format. Only equal * sized bitmaps are supported, with {@link #inSampleSize} set to 1.