diff options
| author | Chet Haase <chet@google.com> | 2013-09-05 07:44:18 -0700 |
|---|---|---|
| committer | Chet Haase <chet@google.com> | 2013-09-05 08:44:33 -0700 |
| commit | e8222dddaf2e3da14380101e818d4254899e0c0d (patch) | |
| tree | 082abae3fd483ef9cf6ea2ee5a9c2ee19363a08a /core/java/android/widget | |
| parent | 9e8bdc39bcdfc22d05edd5f4a0ca69cdffec4f34 (diff) | |
| download | frameworks_base-e8222dddaf2e3da14380101e818d4254899e0c0d.zip frameworks_base-e8222dddaf2e3da14380101e818d4254899e0c0d.tar.gz frameworks_base-e8222dddaf2e3da14380101e818d4254899e0c0d.tar.bz2 | |
Change build version from KEY_LIME_PIE to KITKAT
Issue #10631619 Change build version to KitKat
Change-Id: I6ad13f6169ad74204078d36929479998b498ad8b
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/ListView.java | 8 | ||||
| -rw-r--r-- | core/java/android/widget/RelativeLayout.java | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index 941ddfc..389d9d6 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -248,7 +248,7 @@ public class ListView extends AbsListView { * <p> * 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 { * <p> * 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 { * <p> * 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 { * <p> * 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 b9b6b08..92c9b93 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); |