diff options
author | Aurimas Liutikas <aurimas@google.com> | 2018-04-09 16:50:03 -0700 |
---|---|---|
committer | Raman Tenneti <rtenneti@google.com> | 2019-02-16 16:45:09 +0000 |
commit | 7c951cab6e0df79de3e8b02e5e4fd6ef57defd74 (patch) | |
tree | 2118db218ae517afd95b1ee7e469764f6513c03c | |
parent | 57e47c5d7d123729dd81b038c857afb6bb9a5721 (diff) | |
download | chips-7c951cab6e0df79de3e8b02e5e4fd6ef57defd74.tar.gz |
Convert libchips to androidx.
Updated Androd.bp and sample/Android.bp to use androidx (from change id: I0a602f768cef3a946b2851541a1aa21ee910ff19)
Test: make libchips
Bug: 76692459
Change-Id: Ie18c2335c6610cda7e05058f05ceb674c34de29b
Merged-In: Ie18c2335c6610cda7e05058f05ceb674c34de29b
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | sample/Android.bp | 4 | ||||
-rw-r--r-- | src/com/android/ex/chips/BaseRecipientAdapter.java | 2 | ||||
-rw-r--r-- | src/com/android/ex/chips/ChipsUtil.java | 2 | ||||
-rw-r--r-- | src/com/android/ex/chips/DefaultPhotoManager.java | 2 | ||||
-rw-r--r-- | src/com/android/ex/chips/DropdownChipLayouter.java | 10 | ||||
-rw-r--r-- | src/com/android/ex/chips/RecipientEditTextView.java | 2 | ||||
-rw-r--r-- | src/com/android/ex/chips/RecipientEntry.java | 2 |
8 files changed, 14 insertions, 14 deletions
@@ -15,8 +15,8 @@ android_library { name: "libchips", static_libs: [ - "android-support-annotations", - "android-support-compat", + "androidx.annotation_annotation", + "androidx.core_core", ], sdk_version: "current", srcs: [ diff --git a/sample/Android.bp b/sample/Android.bp index 2502650..72da660 100644 --- a/sample/Android.bp +++ b/sample/Android.bp @@ -19,9 +19,9 @@ android_app { name: "libChipsSample", static_libs: [ - "android-support-annotations", + "androidx.annotation_annotation", "libchips", - "android-support-compat", + "androidx.core_core", ], sdk_version: "current", diff --git a/src/com/android/ex/chips/BaseRecipientAdapter.java b/src/com/android/ex/chips/BaseRecipientAdapter.java index f39b016..72f42f2 100644 --- a/src/com/android/ex/chips/BaseRecipientAdapter.java +++ b/src/com/android/ex/chips/BaseRecipientAdapter.java @@ -30,7 +30,7 @@ import android.os.Handler; import android.os.Message; import android.provider.ContactsContract; import android.provider.ContactsContract.Directory; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.text.util.Rfc822Token; import android.util.Log; diff --git a/src/com/android/ex/chips/ChipsUtil.java b/src/com/android/ex/chips/ChipsUtil.java index 9c299fa..ea31b20 100644 --- a/src/com/android/ex/chips/ChipsUtil.java +++ b/src/com/android/ex/chips/ChipsUtil.java @@ -21,7 +21,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Build; import android.os.Process; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public class ChipsUtil { diff --git a/src/com/android/ex/chips/DefaultPhotoManager.java b/src/com/android/ex/chips/DefaultPhotoManager.java index b9c001d..321e54b 100644 --- a/src/com/android/ex/chips/DefaultPhotoManager.java +++ b/src/com/android/ex/chips/DefaultPhotoManager.java @@ -21,7 +21,7 @@ import android.database.Cursor; import android.net.Uri; import android.os.AsyncTask; import android.provider.ContactsContract; -import android.support.v4.util.LruCache; +import androidx.collection.LruCache; import android.util.Log; import java.io.ByteArrayOutputStream; diff --git a/src/com/android/ex/chips/DropdownChipLayouter.java b/src/com/android/ex/chips/DropdownChipLayouter.java index 6ca3d0e..77415c1 100644 --- a/src/com/android/ex/chips/DropdownChipLayouter.java +++ b/src/com/android/ex/chips/DropdownChipLayouter.java @@ -9,11 +9,11 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.graphics.drawable.StateListDrawable; import android.net.Uri; -import android.support.annotation.DrawableRes; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; -import android.support.v4.view.MarginLayoutParamsCompat; +import androidx.annotation.DrawableRes; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; +import androidx.core.view.MarginLayoutParamsCompat; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextUtils; diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java index d9655a5..bc55bd4 100644 --- a/src/com/android/ex/chips/RecipientEditTextView.java +++ b/src/com/android/ex/chips/RecipientEditTextView.java @@ -50,7 +50,7 @@ import android.os.Handler; import android.os.Looper; import android.os.Message; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Editable; import android.text.InputType; import android.text.Layout; diff --git a/src/com/android/ex/chips/RecipientEntry.java b/src/com/android/ex/chips/RecipientEntry.java index 2669242..a42794f 100644 --- a/src/com/android/ex/chips/RecipientEntry.java +++ b/src/com/android/ex/chips/RecipientEntry.java @@ -19,7 +19,7 @@ package com.android.ex.chips; import android.net.Uri; import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.DisplayNameSources; -import android.support.annotation.DrawableRes; +import androidx.annotation.DrawableRes; import android.text.util.Rfc822Token; import android.text.util.Rfc822Tokenizer; |