diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2018-04-09 17:17:41 -0700 |
|---|---|---|
| committer | Aurimas Liutikas <aurimas@google.com> | 2018-04-09 17:17:41 -0700 |
| commit | f38a1bdc3c5b47024fe4c605e6a487e5353dfedf (patch) | |
| tree | f984fb8ad740e266726dbe02d4fa3d9f6a283c0c /src | |
| parent | 49d1460b978609739c296c5b5380e1967d40532e (diff) | |
| download | android_packages_apps_Messaging-f38a1bdc3c5b47024fe4c605e6a487e5353dfedf.tar.gz android_packages_apps_Messaging-f38a1bdc3c5b47024fe4c605e6a487e5353dfedf.tar.bz2 android_packages_apps_Messaging-f38a1bdc3c5b47024fe4c605e6a487e5353dfedf.zip | |
Migrate Messaging to androidx.
Test: make messaging
Bug: 76692459
Change-Id: I9103450622f129311545648ac75f5b2f9fc2d04a
Diffstat (limited to 'src')
147 files changed, 214 insertions, 214 deletions
diff --git a/src/android/support/v7/mms/ApnException.java b/src/android/support/v7/mms/ApnException.java index 075d92d..322260a 100644 --- a/src/android/support/v7/mms/ApnException.java +++ b/src/android/support/v7/mms/ApnException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; /** * APN exception diff --git a/src/android/support/v7/mms/ApnSettingsLoader.java b/src/android/support/v7/mms/ApnSettingsLoader.java index ff8ed12..9ccfc06 100644 --- a/src/android/support/v7/mms/ApnSettingsLoader.java +++ b/src/android/support/v7/mms/ApnSettingsLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import java.util.List; diff --git a/src/android/support/v7/mms/ApnsXmlParser.java b/src/android/support/v7/mms/ApnsXmlParser.java index eeafcf6..2d63136 100644 --- a/src/android/support/v7/mms/ApnsXmlParser.java +++ b/src/android/support/v7/mms/ApnsXmlParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.content.ContentValues; diff --git a/src/android/support/v7/mms/CarrierConfigValuesLoader.java b/src/android/support/v7/mms/CarrierConfigValuesLoader.java index ad94fb2..150d92d 100644 --- a/src/android/support/v7/mms/CarrierConfigValuesLoader.java +++ b/src/android/support/v7/mms/CarrierConfigValuesLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.os.Bundle; diff --git a/src/android/support/v7/mms/CarrierConfigXmlParser.java b/src/android/support/v7/mms/CarrierConfigXmlParser.java index 42e7c21..2e95d52 100644 --- a/src/android/support/v7/mms/CarrierConfigXmlParser.java +++ b/src/android/support/v7/mms/CarrierConfigXmlParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/android/support/v7/mms/DefaultApnSettingsLoader.java b/src/android/support/v7/mms/DefaultApnSettingsLoader.java index 83f2fd3..2c2ba67 100644 --- a/src/android/support/v7/mms/DefaultApnSettingsLoader.java +++ b/src/android/support/v7/mms/DefaultApnSettingsLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.content.ContentValues; import android.content.Context; diff --git a/src/android/support/v7/mms/DefaultCarrierConfigValuesLoader.java b/src/android/support/v7/mms/DefaultCarrierConfigValuesLoader.java index 1d45f8f..1a45338 100644 --- a/src/android/support/v7/mms/DefaultCarrierConfigValuesLoader.java +++ b/src/android/support/v7/mms/DefaultCarrierConfigValuesLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.content.Context; import android.content.res.Resources; diff --git a/src/android/support/v7/mms/DefaultUserAgentInfoLoader.java b/src/android/support/v7/mms/DefaultUserAgentInfoLoader.java index e59a234..e6191ce 100644 --- a/src/android/support/v7/mms/DefaultUserAgentInfoLoader.java +++ b/src/android/support/v7/mms/DefaultUserAgentInfoLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.content.Context; import android.telephony.TelephonyManager; diff --git a/src/android/support/v7/mms/DownloadRequest.java b/src/android/support/v7/mms/DownloadRequest.java index 254c8ca..5db01f8 100644 --- a/src/android/support/v7/mms/DownloadRequest.java +++ b/src/android/support/v7/mms/DownloadRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.app.PendingIntent; import android.content.ContentResolver; diff --git a/src/android/support/v7/mms/MmsHttpClient.java b/src/android/support/v7/mms/MmsHttpClient.java index 6c1c35e..241e4b8 100644 --- a/src/android/support/v7/mms/MmsHttpClient.java +++ b/src/android/support/v7/mms/MmsHttpClient.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.content.Context; import android.os.Bundle; diff --git a/src/android/support/v7/mms/MmsHttpException.java b/src/android/support/v7/mms/MmsHttpException.java index 913ba55..545c66d 100644 --- a/src/android/support/v7/mms/MmsHttpException.java +++ b/src/android/support/v7/mms/MmsHttpException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; /** * HTTP exception diff --git a/src/android/support/v7/mms/MmsManager.java b/src/android/support/v7/mms/MmsManager.java index f9c0a91..4a72a32 100644 --- a/src/android/support/v7/mms/MmsManager.java +++ b/src/android/support/v7/mms/MmsManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.app.PendingIntent; import android.content.Context; diff --git a/src/android/support/v7/mms/MmsNetworkException.java b/src/android/support/v7/mms/MmsNetworkException.java index 776d8ee..77e0912 100644 --- a/src/android/support/v7/mms/MmsNetworkException.java +++ b/src/android/support/v7/mms/MmsNetworkException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; /** * MMS network exception diff --git a/src/android/support/v7/mms/MmsNetworkManager.java b/src/android/support/v7/mms/MmsNetworkManager.java index 0630293..059ca8f 100644 --- a/src/android/support/v7/mms/MmsNetworkManager.java +++ b/src/android/support/v7/mms/MmsNetworkManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/src/android/support/v7/mms/MmsRequest.java b/src/android/support/v7/mms/MmsRequest.java index edf3606..b96902e 100644 --- a/src/android/support/v7/mms/MmsRequest.java +++ b/src/android/support/v7/mms/MmsRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.app.Activity; import android.app.PendingIntent; @@ -25,10 +25,10 @@ import android.net.Uri; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.v7.mms.pdu.GenericPdu; -import android.support.v7.mms.pdu.PduHeaders; -import android.support.v7.mms.pdu.PduParser; -import android.support.v7.mms.pdu.SendConf; +import androidx.appcompat.mms.pdu.GenericPdu; +import androidx.appcompat.mms.pdu.PduHeaders; +import androidx.appcompat.mms.pdu.PduParser; +import androidx.appcompat.mms.pdu.SendConf; import android.telephony.SmsManager; import android.text.TextUtils; import android.util.Log; diff --git a/src/android/support/v7/mms/MmsService.java b/src/android/support/v7/mms/MmsService.java index 650562f..fb2dee8 100644 --- a/src/android/support/v7/mms/MmsService.java +++ b/src/android/support/v7/mms/MmsService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.app.Service; import android.content.Context; diff --git a/src/android/support/v7/mms/MmsXmlResourceParser.java b/src/android/support/v7/mms/MmsXmlResourceParser.java index 1ee73e2..60d1ed7 100644 --- a/src/android/support/v7/mms/MmsXmlResourceParser.java +++ b/src/android/support/v7/mms/MmsXmlResourceParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.util.Log; diff --git a/src/android/support/v7/mms/PhoneNumberHelper.java b/src/android/support/v7/mms/PhoneNumberHelper.java index 99551c0..a5bebae 100644 --- a/src/android/support/v7/mms/PhoneNumberHelper.java +++ b/src/android/support/v7/mms/PhoneNumberHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.text.TextUtils; import android.util.Log; diff --git a/src/android/support/v7/mms/SendRequest.java b/src/android/support/v7/mms/SendRequest.java index 1b7b1db..a36ffc4 100644 --- a/src/android/support/v7/mms/SendRequest.java +++ b/src/android/support/v7/mms/SendRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.app.PendingIntent; import android.content.ContentResolver; diff --git a/src/android/support/v7/mms/UserAgentInfoLoader.java b/src/android/support/v7/mms/UserAgentInfoLoader.java index 214d58d..783f99c 100644 --- a/src/android/support/v7/mms/UserAgentInfoLoader.java +++ b/src/android/support/v7/mms/UserAgentInfoLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; /** * Interface to load UserAgent and UA Prof URL diff --git a/src/android/support/v7/mms/Utils.java b/src/android/support/v7/mms/Utils.java index cb55c2e..593e444 100644 --- a/src/android/support/v7/mms/Utils.java +++ b/src/android/support/v7/mms/Utils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.v7.mms; +package androidx.appcompat.mms; import android.content.Context; import android.content.res.Configuration; diff --git a/src/android/support/v7/mms/pdu/AcknowledgeInd.java b/src/android/support/v7/mms/pdu/AcknowledgeInd.java index 10f9e35..b2ca729 100644 --- a/src/android/support/v7/mms/pdu/AcknowledgeInd.java +++ b/src/android/support/v7/mms/pdu/AcknowledgeInd.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; /** * M-Acknowledge.ind PDU. diff --git a/src/android/support/v7/mms/pdu/Base64.java b/src/android/support/v7/mms/pdu/Base64.java index 9f3418f..18c2959 100644 --- a/src/android/support/v7/mms/pdu/Base64.java +++ b/src/android/support/v7/mms/pdu/Base64.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; public class Base64 { /** diff --git a/src/android/support/v7/mms/pdu/CharacterSets.java b/src/android/support/v7/mms/pdu/CharacterSets.java index 8ce2a02..e03ee60 100644 --- a/src/android/support/v7/mms/pdu/CharacterSets.java +++ b/src/android/support/v7/mms/pdu/CharacterSets.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; import java.io.UnsupportedEncodingException; import java.util.HashMap; diff --git a/src/android/support/v7/mms/pdu/ContentType.java b/src/android/support/v7/mms/pdu/ContentType.java index 7ba961d..eee98c1 100644 --- a/src/android/support/v7/mms/pdu/ContentType.java +++ b/src/android/support/v7/mms/pdu/ContentType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; import java.util.ArrayList; diff --git a/src/android/support/v7/mms/pdu/DeliveryInd.java b/src/android/support/v7/mms/pdu/DeliveryInd.java index d7d72d9..1ee1539 100644 --- a/src/android/support/v7/mms/pdu/DeliveryInd.java +++ b/src/android/support/v7/mms/pdu/DeliveryInd.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; /** * M-Delivery.Ind Pdu. diff --git a/src/android/support/v7/mms/pdu/EncodedStringValue.java b/src/android/support/v7/mms/pdu/EncodedStringValue.java index 6a914ae..5ae1e43 100644 --- a/src/android/support/v7/mms/pdu/EncodedStringValue.java +++ b/src/android/support/v7/mms/pdu/EncodedStringValue.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; import android.util.Log; diff --git a/src/android/support/v7/mms/pdu/GenericPdu.java b/src/android/support/v7/mms/pdu/GenericPdu.java index 2f0d167..a19520c 100644 --- a/src/android/support/v7/mms/pdu/GenericPdu.java +++ b/src/android/support/v7/mms/pdu/GenericPdu.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; public class GenericPdu { /** diff --git a/src/android/support/v7/mms/pdu/InvalidHeaderValueException.java b/src/android/support/v7/mms/pdu/InvalidHeaderValueException.java index 4b1de02..6df4974 100644 --- a/src/android/support/v7/mms/pdu/InvalidHeaderValueException.java +++ b/src/android/support/v7/mms/pdu/InvalidHeaderValueException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; /** * Thrown when an invalid header value was set. diff --git a/src/android/support/v7/mms/pdu/MmsException.java b/src/android/support/v7/mms/pdu/MmsException.java index 1fd1a02..1237e90 100644 --- a/src/android/support/v7/mms/pdu/MmsException.java +++ b/src/android/support/v7/mms/pdu/MmsException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; /** * A generic exception that is thrown by the Mms client. diff --git a/src/android/support/v7/mms/pdu/MultimediaMessagePdu.java b/src/android/support/v7/mms/pdu/MultimediaMessagePdu.java index 12f3b6d..69670b6 100644 --- a/src/android/support/v7/mms/pdu/MultimediaMessagePdu.java +++ b/src/android/support/v7/mms/pdu/MultimediaMessagePdu.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; /** * Multimedia message PDU. diff --git a/src/android/support/v7/mms/pdu/NotificationInd.java b/src/android/support/v7/mms/pdu/NotificationInd.java index 16aa23d..cad6ac4 100644 --- a/src/android/support/v7/mms/pdu/NotificationInd.java +++ b/src/android/support/v7/mms/pdu/NotificationInd.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; /** * M-Notification.ind PDU. diff --git a/src/android/support/v7/mms/pdu/NotifyRespInd.java b/src/android/support/v7/mms/pdu/NotifyRespInd.java index cb8e92b..c28458b 100644 --- a/src/android/support/v7/mms/pdu/NotifyRespInd.java +++ b/src/android/support/v7/mms/pdu/NotifyRespInd.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; /** * M-NofifyResp.ind PDU. diff --git a/src/android/support/v7/mms/pdu/PduBody.java b/src/android/support/v7/mms/pdu/PduBody.java index 9d983fc..fa2b4a6 100644 --- a/src/android/support/v7/mms/pdu/PduBody.java +++ b/src/android/support/v7/mms/pdu/PduBody.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; import java.util.HashMap; import java.util.Map; diff --git a/src/android/support/v7/mms/pdu/PduContentTypes.java b/src/android/support/v7/mms/pdu/PduContentTypes.java index 7cd0ecf..9639119 100644 --- a/src/android/support/v7/mms/pdu/PduContentTypes.java +++ b/src/android/support/v7/mms/pdu/PduContentTypes.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; public class PduContentTypes { /** diff --git a/src/android/support/v7/mms/pdu/PduHeaders.java b/src/android/support/v7/mms/pdu/PduHeaders.java index 0271e58..bea31bf 100644 --- a/src/android/support/v7/mms/pdu/PduHeaders.java +++ b/src/android/support/v7/mms/pdu/PduHeaders.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/android/support/v7/mms/pdu/PduParser.java b/src/android/support/v7/mms/pdu/PduParser.java index 7d30df5..206aa12 100755 --- a/src/android/support/v7/mms/pdu/PduParser.java +++ b/src/android/support/v7/mms/pdu/PduParser.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; import android.util.Log; diff --git a/src/android/support/v7/mms/pdu/PduPart.java b/src/android/support/v7/mms/pdu/PduPart.java index ec8e1a2..b20045e 100644 --- a/src/android/support/v7/mms/pdu/PduPart.java +++ b/src/android/support/v7/mms/pdu/PduPart.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; import android.net.Uri; diff --git a/src/android/support/v7/mms/pdu/QuotedPrintable.java b/src/android/support/v7/mms/pdu/QuotedPrintable.java index ea0abc5..2e16581 100644 --- a/src/android/support/v7/mms/pdu/QuotedPrintable.java +++ b/src/android/support/v7/mms/pdu/QuotedPrintable.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; import java.io.ByteArrayOutputStream; diff --git a/src/android/support/v7/mms/pdu/ReadOrigInd.java b/src/android/support/v7/mms/pdu/ReadOrigInd.java index 500a59d..c0e37ee 100644 --- a/src/android/support/v7/mms/pdu/ReadOrigInd.java +++ b/src/android/support/v7/mms/pdu/ReadOrigInd.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; public class ReadOrigInd extends GenericPdu { /** diff --git a/src/android/support/v7/mms/pdu/ReadRecInd.java b/src/android/support/v7/mms/pdu/ReadRecInd.java index 9683d00..bd0848c 100644 --- a/src/android/support/v7/mms/pdu/ReadRecInd.java +++ b/src/android/support/v7/mms/pdu/ReadRecInd.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; public class ReadRecInd extends GenericPdu { /** diff --git a/src/android/support/v7/mms/pdu/RetrieveConf.java b/src/android/support/v7/mms/pdu/RetrieveConf.java index 752ca04..4da42eb 100644 --- a/src/android/support/v7/mms/pdu/RetrieveConf.java +++ b/src/android/support/v7/mms/pdu/RetrieveConf.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; /** * M-Retrive.conf Pdu. diff --git a/src/android/support/v7/mms/pdu/SendConf.java b/src/android/support/v7/mms/pdu/SendConf.java index 5486398..94a9abc 100644 --- a/src/android/support/v7/mms/pdu/SendConf.java +++ b/src/android/support/v7/mms/pdu/SendConf.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; public class SendConf extends GenericPdu { /** diff --git a/src/android/support/v7/mms/pdu/SendReq.java b/src/android/support/v7/mms/pdu/SendReq.java index 0b78cc3..bf3b32c 100644 --- a/src/android/support/v7/mms/pdu/SendReq.java +++ b/src/android/support/v7/mms/pdu/SendReq.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package android.support.v7.mms.pdu; +package androidx.appcompat.mms.pdu; import android.util.Log; diff --git a/src/com/android/messaging/BugleApplication.java b/src/com/android/messaging/BugleApplication.java index a5aea9f..0ef8d91 100644 --- a/src/com/android/messaging/BugleApplication.java +++ b/src/com/android/messaging/BugleApplication.java @@ -24,8 +24,8 @@ import android.content.IntentFilter; import android.content.res.Configuration; import android.os.Handler; import android.os.Looper; -import android.support.v7.mms.CarrierConfigValuesLoader; -import android.support.v7.mms.MmsManager; +import androidx.appcompat.mms.CarrierConfigValuesLoader; +import androidx.appcompat.mms.MmsManager; import android.telephony.CarrierConfigManager; import com.android.messaging.datamodel.DataModel; diff --git a/src/com/android/messaging/datamodel/BitmapPool.java b/src/com/android/messaging/datamodel/BitmapPool.java index 1ec4f76..1a673ba 100644 --- a/src/com/android/messaging/datamodel/BitmapPool.java +++ b/src/com/android/messaging/datamodel/BitmapPool.java @@ -19,7 +19,7 @@ package com.android.messaging.datamodel; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.SparseArray; diff --git a/src/com/android/messaging/datamodel/BugleDatabaseOperations.java b/src/com/android/messaging/datamodel/BugleDatabaseOperations.java index d30cec4..281a8dd 100644 --- a/src/com/android/messaging/datamodel/BugleDatabaseOperations.java +++ b/src/com/android/messaging/datamodel/BugleDatabaseOperations.java @@ -23,8 +23,8 @@ import android.database.sqlite.SQLiteDoneException; import android.database.sqlite.SQLiteStatement; import android.net.Uri; import android.os.ParcelFileDescriptor; -import android.support.v4.util.ArrayMap; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.ArrayMap; +import androidx.collection.SimpleArrayMap; import android.text.TextUtils; import com.android.messaging.Factory; diff --git a/src/com/android/messaging/datamodel/BugleNotifications.java b/src/com/android/messaging/datamodel/BugleNotifications.java index b796e73..3faee85 100644 --- a/src/com/android/messaging/datamodel/BugleNotifications.java +++ b/src/com/android/messaging/datamodel/BugleNotifications.java @@ -32,11 +32,11 @@ import android.os.Bundle; import android.os.SystemClock; import android.provider.ContactsContract; import android.provider.ContactsContract.Contacts; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationCompat.WearableExtender; -import android.support.v4.app.NotificationManagerCompat; -import android.support.v4.app.RemoteInput; -import android.support.v4.util.SimpleArrayMap; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationCompat.WearableExtender; +import androidx.core.app.NotificationManagerCompat; +import androidx.core.app.RemoteInput; +import androidx.collection.SimpleArrayMap; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.TextUtils; diff --git a/src/com/android/messaging/datamodel/FrequentContactsCursorBuilder.java b/src/com/android/messaging/datamodel/FrequentContactsCursorBuilder.java index 62483a0..8f65156 100644 --- a/src/com/android/messaging/datamodel/FrequentContactsCursorBuilder.java +++ b/src/com/android/messaging/datamodel/FrequentContactsCursorBuilder.java @@ -18,7 +18,7 @@ package com.android.messaging.datamodel; import android.database.Cursor; import android.database.MatrixCursor; import android.provider.ContactsContract.CommonDataKinds.Phone; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.SimpleArrayMap; import com.android.messaging.util.Assert; import com.android.messaging.util.ContactUtil; diff --git a/src/com/android/messaging/datamodel/MediaScratchFileProvider.java b/src/com/android/messaging/datamodel/MediaScratchFileProvider.java index a19523f..6f21bc5 100644 --- a/src/com/android/messaging/datamodel/MediaScratchFileProvider.java +++ b/src/com/android/messaging/datamodel/MediaScratchFileProvider.java @@ -23,7 +23,7 @@ import android.database.MatrixCursor; import android.database.MatrixCursor.RowBuilder; import android.net.Uri; import android.provider.OpenableColumns; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.SimpleArrayMap; import android.text.TextUtils; import com.android.messaging.Factory; diff --git a/src/com/android/messaging/datamodel/MessageNotificationState.java b/src/com/android/messaging/datamodel/MessageNotificationState.java index 0bd4aaa..ae50801 100644 --- a/src/com/android/messaging/datamodel/MessageNotificationState.java +++ b/src/com/android/messaging/datamodel/MessageNotificationState.java @@ -22,10 +22,10 @@ import android.content.res.Resources; import android.database.Cursor; import android.graphics.Typeface; import android.net.Uri; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationCompat.Builder; -import android.support.v4.app.NotificationCompat.WearableExtender; -import android.support.v4.app.NotificationManagerCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationCompat.Builder; +import androidx.core.app.NotificationCompat.WearableExtender; +import androidx.core.app.NotificationManagerCompat; import android.text.Html; import android.text.Spannable; import android.text.SpannableString; diff --git a/src/com/android/messaging/datamodel/NoConfirmationSmsSendService.java b/src/com/android/messaging/datamodel/NoConfirmationSmsSendService.java index 791ff34..b5d2185 100644 --- a/src/com/android/messaging/datamodel/NoConfirmationSmsSendService.java +++ b/src/com/android/messaging/datamodel/NoConfirmationSmsSendService.java @@ -20,7 +20,7 @@ import android.app.IntentService; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.RemoteInput; +import androidx.core.app.RemoteInput; import android.telephony.TelephonyManager; import android.text.TextUtils; diff --git a/src/com/android/messaging/datamodel/NotificationState.java b/src/com/android/messaging/datamodel/NotificationState.java index d589874..e19f70c 100644 --- a/src/com/android/messaging/datamodel/NotificationState.java +++ b/src/com/android/messaging/datamodel/NotificationState.java @@ -17,7 +17,7 @@ package com.android.messaging.datamodel; import android.app.PendingIntent; import android.net.Uri; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import com.android.messaging.datamodel.DatabaseHelper.MessageColumns; import com.android.messaging.datamodel.data.MessageData; diff --git a/src/com/android/messaging/datamodel/ParticipantRefresh.java b/src/com/android/messaging/datamodel/ParticipantRefresh.java index 5324496..55d439b 100644 --- a/src/com/android/messaging/datamodel/ParticipantRefresh.java +++ b/src/com/android/messaging/datamodel/ParticipantRefresh.java @@ -22,7 +22,7 @@ import android.database.Cursor; import android.database.DatabaseUtils; import android.graphics.Color; import android.provider.ContactsContract.CommonDataKinds.Phone; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import android.telephony.SubscriptionInfo; import android.text.TextUtils; diff --git a/src/com/android/messaging/datamodel/SyncManager.java b/src/com/android/messaging/datamodel/SyncManager.java index 41d3dee..28fc696 100644 --- a/src/com/android/messaging/datamodel/SyncManager.java +++ b/src/com/android/messaging/datamodel/SyncManager.java @@ -21,7 +21,7 @@ import android.content.pm.PackageManager; import android.database.ContentObserver; import android.net.Uri; import android.provider.Telephony; -import android.support.v4.util.LongSparseArray; +import androidx.collection.LongSparseArray; import com.android.messaging.datamodel.action.SyncMessagesAction; import com.android.messaging.datamodel.data.ParticipantData; diff --git a/src/com/android/messaging/datamodel/action/ActionMonitor.java b/src/com/android/messaging/datamodel/action/ActionMonitor.java index cb080aa..ac83414 100644 --- a/src/com/android/messaging/datamodel/action/ActionMonitor.java +++ b/src/com/android/messaging/datamodel/action/ActionMonitor.java @@ -17,7 +17,7 @@ package com.android.messaging.datamodel.action; import android.os.Handler; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.SimpleArrayMap; import android.text.TextUtils; import com.android.messaging.util.Assert.RunsOnAnyThread; diff --git a/src/com/android/messaging/datamodel/action/SyncCursorPair.java b/src/com/android/messaging/datamodel/action/SyncCursorPair.java index b3a2676..e2fd7ec 100644 --- a/src/com/android/messaging/datamodel/action/SyncCursorPair.java +++ b/src/com/android/messaging/datamodel/action/SyncCursorPair.java @@ -21,7 +21,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteException; import android.provider.Telephony.Mms; import android.provider.Telephony.Sms; -import android.support.v4.util.LongSparseArray; +import androidx.collection.LongSparseArray; import android.text.TextUtils; import com.android.messaging.Factory; diff --git a/src/com/android/messaging/datamodel/action/SyncMessagesAction.java b/src/com/android/messaging/datamodel/action/SyncMessagesAction.java index f4a3e1f..a11d5bb 100644 --- a/src/com/android/messaging/datamodel/action/SyncMessagesAction.java +++ b/src/com/android/messaging/datamodel/action/SyncMessagesAction.java @@ -24,7 +24,7 @@ import android.os.Parcel; import android.os.Parcelable; import android.os.SystemClock; import android.provider.Telephony.Mms; -import android.support.v4.util.LongSparseArray; +import androidx.collection.LongSparseArray; import com.android.messaging.Factory; import com.android.messaging.datamodel.DataModel; diff --git a/src/com/android/messaging/datamodel/data/ConversationData.java b/src/com/android/messaging/datamodel/data/ConversationData.java index d504928..55d5bfc 100644 --- a/src/com/android/messaging/datamodel/data/ConversationData.java +++ b/src/com/android/messaging/datamodel/data/ConversationData.java @@ -24,7 +24,7 @@ import android.database.CursorWrapper; import android.database.sqlite.SQLiteFullException; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.android.common.contacts.DataUsageStatUpdater; diff --git a/src/com/android/messaging/datamodel/data/ConversationParticipantsData.java b/src/com/android/messaging/datamodel/data/ConversationParticipantsData.java index 2ab1793..962cb74 100644 --- a/src/com/android/messaging/datamodel/data/ConversationParticipantsData.java +++ b/src/com/android/messaging/datamodel/data/ConversationParticipantsData.java @@ -17,7 +17,7 @@ package com.android.messaging.datamodel.data; import android.database.Cursor; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.SimpleArrayMap; import com.android.messaging.util.Assert; diff --git a/src/com/android/messaging/datamodel/data/MediaPickerData.java b/src/com/android/messaging/datamodel/data/MediaPickerData.java index b0c8bf7..7fef67f 100644 --- a/src/com/android/messaging/datamodel/data/MediaPickerData.java +++ b/src/com/android/messaging/datamodel/data/MediaPickerData.java @@ -21,7 +21,7 @@ import android.content.Context; import android.content.Loader; import android.database.Cursor; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.android.messaging.datamodel.BoundCursorLoader; import com.android.messaging.datamodel.GalleryBoundCursorLoader; diff --git a/src/com/android/messaging/datamodel/data/ParticipantData.java b/src/com/android/messaging/datamodel/data/ParticipantData.java index 521c354..51e6ee2 100644 --- a/src/com/android/messaging/datamodel/data/ParticipantData.java +++ b/src/com/android/messaging/datamodel/data/ParticipantData.java @@ -22,7 +22,7 @@ import android.database.Cursor; import android.graphics.Color; import android.os.Parcel; import android.os.Parcelable; -import android.support.v7.mms.MmsManager; +import androidx.appcompat.mms.MmsManager; import android.telephony.SubscriptionInfo; import android.text.TextUtils; diff --git a/src/com/android/messaging/datamodel/data/PendingAttachmentData.java b/src/com/android/messaging/datamodel/data/PendingAttachmentData.java index 5e079f8..a5b5460 100644 --- a/src/com/android/messaging/datamodel/data/PendingAttachmentData.java +++ b/src/com/android/messaging/datamodel/data/PendingAttachmentData.java @@ -18,7 +18,7 @@ package com.android.messaging.datamodel.data; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.android.messaging.util.Assert; import com.android.messaging.util.ContentType; diff --git a/src/com/android/messaging/datamodel/data/SelfParticipantsData.java b/src/com/android/messaging/datamodel/data/SelfParticipantsData.java index 43302ed..fc4027f 100644 --- a/src/com/android/messaging/datamodel/data/SelfParticipantsData.java +++ b/src/com/android/messaging/datamodel/data/SelfParticipantsData.java @@ -17,7 +17,7 @@ package com.android.messaging.datamodel.data; import android.database.Cursor; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/messaging/datamodel/media/CustomVCardEntry.java b/src/com/android/messaging/datamodel/media/CustomVCardEntry.java index aee9fdc..965259f 100644 --- a/src/com/android/messaging/datamodel/media/CustomVCardEntry.java +++ b/src/com/android/messaging/datamodel/media/CustomVCardEntry.java @@ -16,7 +16,7 @@ package com.android.messaging.datamodel.media; import android.accounts.Account; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import com.android.vcard.VCardEntry; import com.android.vcard.VCardProperty; diff --git a/src/com/android/messaging/datamodel/media/PoolableImageCache.java b/src/com/android/messaging/datamodel/media/PoolableImageCache.java index df814ba..1d8ebc1 100644 --- a/src/com/android/messaging/datamodel/media/PoolableImageCache.java +++ b/src/com/android/messaging/datamodel/media/PoolableImageCache.java @@ -19,7 +19,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Color; import android.os.SystemClock; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.SparseArray; import com.android.messaging.Factory; diff --git a/src/com/android/messaging/datamodel/media/VCardResourceEntry.java b/src/com/android/messaging/datamodel/media/VCardResourceEntry.java index f76b796..f0f7591 100644 --- a/src/com/android/messaging/datamodel/media/VCardResourceEntry.java +++ b/src/com/android/messaging/datamodel/media/VCardResourceEntry.java @@ -22,7 +22,7 @@ import android.net.Uri; import android.provider.ContactsContract.CommonDataKinds.Im; import android.provider.ContactsContract.CommonDataKinds.Organization; import android.provider.ContactsContract.CommonDataKinds.Phone; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import android.text.TextUtils; import com.android.messaging.Factory; diff --git a/src/com/android/messaging/mmslib/pdu/CharacterSets.java b/src/com/android/messaging/mmslib/pdu/CharacterSets.java index 0a9099b..3a49e37 100644 --- a/src/com/android/messaging/mmslib/pdu/CharacterSets.java +++ b/src/com/android/messaging/mmslib/pdu/CharacterSets.java @@ -17,7 +17,7 @@ package com.android.messaging.mmslib.pdu; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.SimpleArrayMap; import android.util.SparseArray; import java.io.UnsupportedEncodingException; diff --git a/src/com/android/messaging/mmslib/pdu/PduComposer.java b/src/com/android/messaging/mmslib/pdu/PduComposer.java index d05a198..f318382 100644 --- a/src/com/android/messaging/mmslib/pdu/PduComposer.java +++ b/src/com/android/messaging/mmslib/pdu/PduComposer.java @@ -19,7 +19,7 @@ package com.android.messaging.mmslib.pdu; import android.content.ContentResolver; import android.content.Context; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.SimpleArrayMap; import android.text.TextUtils; import java.io.ByteArrayOutputStream; diff --git a/src/com/android/messaging/mmslib/pdu/PduPersister.java b/src/com/android/messaging/mmslib/pdu/PduPersister.java index 5c54e7b..1139aa1 100644 --- a/src/com/android/messaging/mmslib/pdu/PduPersister.java +++ b/src/com/android/messaging/mmslib/pdu/PduPersister.java @@ -31,8 +31,8 @@ import android.provider.Telephony.Mms.Addr; import android.provider.Telephony.Mms.Part; import android.provider.Telephony.MmsSms; import android.provider.Telephony.MmsSms.PendingMessages; -import android.support.v4.util.ArrayMap; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.ArrayMap; +import androidx.collection.SimpleArrayMap; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; import android.util.Log; diff --git a/src/com/android/messaging/mmslib/util/AbstractCache.java b/src/com/android/messaging/mmslib/util/AbstractCache.java index db98bb9..a4d678a 100644 --- a/src/com/android/messaging/mmslib/util/AbstractCache.java +++ b/src/com/android/messaging/mmslib/util/AbstractCache.java @@ -17,7 +17,7 @@ package com.android.messaging.mmslib.util; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.SimpleArrayMap; import android.util.Log; public abstract class AbstractCache<K, V> { diff --git a/src/com/android/messaging/mmslib/util/PduCache.java b/src/com/android/messaging/mmslib/util/PduCache.java index 9a400c0..939e4bd 100644 --- a/src/com/android/messaging/mmslib/util/PduCache.java +++ b/src/com/android/messaging/mmslib/util/PduCache.java @@ -21,7 +21,7 @@ import android.content.ContentUris; import android.content.UriMatcher; import android.net.Uri; import android.provider.Telephony.Mms; -import android.support.v4.util.SimpleArrayMap; +import androidx.collection.SimpleArrayMap; import android.util.Log; import android.util.SparseArray; diff --git a/src/com/android/messaging/receiver/SmsReceiver.java b/src/com/android/messaging/receiver/SmsReceiver.java index db9b4bb..859beff 100644 --- a/src/com/android/messaging/receiver/SmsReceiver.java +++ b/src/com/android/messaging/receiver/SmsReceiver.java @@ -27,10 +27,10 @@ import android.content.pm.PackageManager; import android.content.res.Resources; import android.provider.Telephony; import android.provider.Telephony.Sms; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationCompat.Builder; -import android.support.v4.app.NotificationCompat.Style; -import android.support.v4.app.NotificationManagerCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationCompat.Builder; +import androidx.core.app.NotificationCompat.Style; +import androidx.core.app.NotificationManagerCompat; import java.util.ArrayList; import java.util.regex.Pattern; diff --git a/src/com/android/messaging/sms/BugleApnSettingsLoader.java b/src/com/android/messaging/sms/BugleApnSettingsLoader.java index 43c95ac..36820ff 100644 --- a/src/com/android/messaging/sms/BugleApnSettingsLoader.java +++ b/src/com/android/messaging/sms/BugleApnSettingsLoader.java @@ -23,8 +23,8 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; import android.net.Uri; import android.provider.Telephony; -import android.support.v7.mms.ApnSettingsLoader; -import android.support.v7.mms.MmsManager; +import androidx.appcompat.mms.ApnSettingsLoader; +import androidx.appcompat.mms.MmsManager; import android.text.TextUtils; import android.util.SparseArray; diff --git a/src/com/android/messaging/sms/BugleCarrierConfigValuesLoader.java b/src/com/android/messaging/sms/BugleCarrierConfigValuesLoader.java index ac6c7e4..51f17cb 100644 --- a/src/com/android/messaging/sms/BugleCarrierConfigValuesLoader.java +++ b/src/com/android/messaging/sms/BugleCarrierConfigValuesLoader.java @@ -21,7 +21,7 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.os.Bundle; -import android.support.v7.mms.CarrierConfigValuesLoader; +import androidx.appcompat.mms.CarrierConfigValuesLoader; import android.util.SparseArray; import com.android.messaging.R; diff --git a/src/com/android/messaging/sms/BugleUserAgentInfoLoader.java b/src/com/android/messaging/sms/BugleUserAgentInfoLoader.java index a8dc5c4..2b1dcd6 100644 --- a/src/com/android/messaging/sms/BugleUserAgentInfoLoader.java +++ b/src/com/android/messaging/sms/BugleUserAgentInfoLoader.java @@ -17,7 +17,7 @@ package com.android.messaging.sms; import android.content.Context; -import android.support.v7.mms.UserAgentInfoLoader; +import androidx.appcompat.mms.UserAgentInfoLoader; import android.telephony.TelephonyManager; import android.text.TextUtils; diff --git a/src/com/android/messaging/sms/MmsConfig.java b/src/com/android/messaging/sms/MmsConfig.java index f13d785..5649be4 100755 --- a/src/com/android/messaging/sms/MmsConfig.java +++ b/src/com/android/messaging/sms/MmsConfig.java @@ -17,7 +17,7 @@ package com.android.messaging.sms; import android.os.Bundle; -import android.support.v7.mms.CarrierConfigValuesLoader; +import androidx.appcompat.mms.CarrierConfigValuesLoader; import android.telephony.SubscriptionInfo; import com.android.messaging.Factory; diff --git a/src/com/android/messaging/sms/MmsSender.java b/src/com/android/messaging/sms/MmsSender.java index 6dfa81a..b881a7f 100644 --- a/src/com/android/messaging/sms/MmsSender.java +++ b/src/com/android/messaging/sms/MmsSender.java @@ -22,7 +22,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v7.mms.MmsManager; +import androidx.appcompat.mms.MmsManager; import android.telephony.SmsManager; import com.android.messaging.datamodel.MmsFileProvider; diff --git a/src/com/android/messaging/sms/SmsStorageStatusManager.java b/src/com/android/messaging/sms/SmsStorageStatusManager.java index ff7b79d..4f03195 100644 --- a/src/com/android/messaging/sms/SmsStorageStatusManager.java +++ b/src/com/android/messaging/sms/SmsStorageStatusManager.java @@ -19,8 +19,8 @@ import android.app.Notification; import android.app.PendingIntent; import android.content.Context; import android.content.res.Resources; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; import com.android.messaging.Factory; import com.android.messaging.R; diff --git a/src/com/android/messaging/ui/AsyncImageView.java b/src/com/android/messaging/ui/AsyncImageView.java index 9aaf0b1..e37966a 100644 --- a/src/com/android/messaging/ui/AsyncImageView.java +++ b/src/com/android/messaging/ui/AsyncImageView.java @@ -24,7 +24,7 @@ import android.graphics.Path; import android.graphics.RectF; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.support.rastermill.FrameSequenceDrawable; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/src/com/android/messaging/ui/AttachmentPreviewFactory.java b/src/com/android/messaging/ui/AttachmentPreviewFactory.java index 7f1fce8..e801fe0 100644 --- a/src/com/android/messaging/ui/AttachmentPreviewFactory.java +++ b/src/com/android/messaging/ui/AttachmentPreviewFactory.java @@ -19,7 +19,7 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Rect; import android.net.Uri; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/src/com/android/messaging/ui/BlockedParticipantListItemView.java b/src/com/android/messaging/ui/BlockedParticipantListItemView.java index 2ccdebf..9654e70 100644 --- a/src/com/android/messaging/ui/BlockedParticipantListItemView.java +++ b/src/com/android/messaging/ui/BlockedParticipantListItemView.java @@ -16,8 +16,8 @@ package com.android.messaging.ui; import android.content.Context; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicsCompat; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicsCompat; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; diff --git a/src/com/android/messaging/ui/BlockedParticipantsFragment.java b/src/com/android/messaging/ui/BlockedParticipantsFragment.java index 3ab54ab..14ec9d8 100644 --- a/src/com/android/messaging/ui/BlockedParticipantsFragment.java +++ b/src/com/android/messaging/ui/BlockedParticipantsFragment.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.os.Bundle; -import android.support.v4.widget.CursorAdapter; +import androidx.cursoradapter.widget.CursorAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/messaging/ui/BugleActionBarActivity.java b/src/com/android/messaging/ui/BugleActionBarActivity.java index 5d9c63a..42d40fe 100644 --- a/src/com/android/messaging/ui/BugleActionBarActivity.java +++ b/src/com/android/messaging/ui/BugleActionBarActivity.java @@ -18,8 +18,8 @@ package com.android.messaging.ui; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.view.ActionMode; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/CursorRecyclerAdapter.java b/src/com/android/messaging/ui/CursorRecyclerAdapter.java index f1a7b7d..750223a 100644 --- a/src/com/android/messaging/ui/CursorRecyclerAdapter.java +++ b/src/com/android/messaging/ui/CursorRecyclerAdapter.java @@ -21,7 +21,7 @@ import android.database.ContentObserver; import android.database.Cursor; import android.database.DataSetObserver; import android.os.Handler; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.ViewGroup; import android.widget.FilterQueryProvider; @@ -158,7 +158,7 @@ public abstract class CursorRecyclerAdapter<VH extends RecyclerView.ViewHolder> } /** - * @see android.support.v7.widget.RecyclerView.Adapter#getItem(int) + * @see androidx.recyclerview.widget.RecyclerView.Adapter#getItem(int) */ public Object getItem(final int position) { if (mDataValid && mCursor != null) { @@ -170,7 +170,7 @@ public abstract class CursorRecyclerAdapter<VH extends RecyclerView.ViewHolder> } /** - * @see android.support.v7.widget.RecyclerView.Adapter#getItemId(int) + * @see androidx.recyclerview.widget.RecyclerView.Adapter#getItemId(int) */ @Override public long getItemId(final int position) { @@ -210,7 +210,7 @@ public abstract class CursorRecyclerAdapter<VH extends RecyclerView.ViewHolder> public abstract void bindViewHolder(VH holder, Context context, Cursor cursor); /** - * @see android.support.v7.widget.RecyclerView.Adapter#createViewHolder(Context, ViewGroup, int) + * @see androidx.recyclerview.widget.RecyclerView.Adapter#createViewHolder(Context, ViewGroup, int) */ public abstract VH createViewHolder(Context context, ViewGroup parent, int viewType); diff --git a/src/com/android/messaging/ui/CustomHeaderViewPager.java b/src/com/android/messaging/ui/CustomHeaderViewPager.java index 2e8df42..31505c8 100644 --- a/src/com/android/messaging/ui/CustomHeaderViewPager.java +++ b/src/com/android/messaging/ui/CustomHeaderViewPager.java @@ -16,9 +16,9 @@ package com.android.messaging.ui; import android.content.Context; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v4.view.ViewPager.OnPageChangeListener; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.viewpager.widget.ViewPager.OnPageChangeListener; import android.util.AttributeSet; import android.util.TypedValue; import android.view.LayoutInflater; diff --git a/src/com/android/messaging/ui/FixedViewPagerAdapter.java b/src/com/android/messaging/ui/FixedViewPagerAdapter.java index bd73b71..30e11e3 100644 --- a/src/com/android/messaging/ui/FixedViewPagerAdapter.java +++ b/src/com/android/messaging/ui/FixedViewPagerAdapter.java @@ -17,7 +17,7 @@ package com.android.messaging.ui; import android.os.Bundle; import android.os.Parcelable; -import android.support.v4.view.PagerAdapter; +import androidx.viewpager.widget.PagerAdapter; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/messaging/ui/PagingAwareViewPager.java b/src/com/android/messaging/ui/PagingAwareViewPager.java index cc7b2cd..34562dc 100644 --- a/src/com/android/messaging/ui/PagingAwareViewPager.java +++ b/src/com/android/messaging/ui/PagingAwareViewPager.java @@ -16,8 +16,8 @@ package com.android.messaging.ui; import android.content.Context; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/src/com/android/messaging/ui/PersonItemView.java b/src/com/android/messaging/ui/PersonItemView.java index afd1a99..2db1219 100644 --- a/src/com/android/messaging/ui/PersonItemView.java +++ b/src/com/android/messaging/ui/PersonItemView.java @@ -17,8 +17,8 @@ package com.android.messaging.ui; import android.content.Context; import android.content.Intent; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicsCompat; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicsCompat; import android.text.TextUtils; import android.util.AttributeSet; import android.view.LayoutInflater; diff --git a/src/com/android/messaging/ui/SnackBar.java b/src/com/android/messaging/ui/SnackBar.java index a278040..2f85461 100644 --- a/src/com/android/messaging/ui/SnackBar.java +++ b/src/com/android/messaging/ui/SnackBar.java @@ -16,8 +16,8 @@ package com.android.messaging.ui; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/src/com/android/messaging/ui/TestActivity.java b/src/com/android/messaging/ui/TestActivity.java index 1693660..fc3c706 100644 --- a/src/com/android/messaging/ui/TestActivity.java +++ b/src/com/android/messaging/ui/TestActivity.java @@ -18,7 +18,7 @@ package com.android.messaging.ui; import android.app.Fragment; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import android.view.View; import android.view.WindowManager; import android.widget.FrameLayout; diff --git a/src/com/android/messaging/ui/UIIntentsImpl.java b/src/com/android/messaging/ui/UIIntentsImpl.java index b7db719..fb624ad 100644 --- a/src/com/android/messaging/ui/UIIntentsImpl.java +++ b/src/com/android/messaging/ui/UIIntentsImpl.java @@ -34,9 +34,9 @@ import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Intents; import android.provider.MediaStore; import android.provider.Telephony; -import android.support.annotation.Nullable; -import android.support.v4.app.TaskStackBuilder; -import android.support.v4.content.LocalBroadcastManager; +import androidx.annotation.Nullable; +import androidx.core.app.TaskStackBuilder; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.text.TextUtils; import com.android.ex.photo.Intents.PhotoViewIntentBuilder; diff --git a/src/com/android/messaging/ui/ViewPagerTabs.java b/src/com/android/messaging/ui/ViewPagerTabs.java index f31a071..bb4aaaf 100644 --- a/src/com/android/messaging/ui/ViewPagerTabs.java +++ b/src/com/android/messaging/ui/ViewPagerTabs.java @@ -20,8 +20,8 @@ import android.content.res.ColorStateList; import android.content.res.TypedArray; import android.graphics.Outline; import android.graphics.drawable.ColorDrawable; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.util.TypedValue; import android.view.Gravity; diff --git a/src/com/android/messaging/ui/animation/PopupTransitionAnimation.java b/src/com/android/messaging/ui/animation/PopupTransitionAnimation.java index 5fc2a19..e14d16e 100644 --- a/src/com/android/messaging/ui/animation/PopupTransitionAnimation.java +++ b/src/com/android/messaging/ui/animation/PopupTransitionAnimation.java @@ -80,7 +80,7 @@ public class PopupTransitionAnimation extends Animation { mPopupRect = new Rect(); mActionBarRect = new Rect(); mActionBarView = viewToAnimate.getRootView().findViewById( - android.support.v7.appcompat.R.id.action_bar); + androidx.appcompat.R.id.action_bar); mRectEvaluator = RectEvaluatorCompat.create(); setDuration(UiUtils.MEDIAPICKER_TRANSITION_DURATION); setInterpolator(UiUtils.DEFAULT_INTERPOLATOR); diff --git a/src/com/android/messaging/ui/animation/ViewGroupItemVerticalExplodeAnimation.java b/src/com/android/messaging/ui/animation/ViewGroupItemVerticalExplodeAnimation.java index 6abfdf9..7dc41fb 100644 --- a/src/com/android/messaging/ui/animation/ViewGroupItemVerticalExplodeAnimation.java +++ b/src/com/android/messaging/ui/animation/ViewGroupItemVerticalExplodeAnimation.java @@ -25,7 +25,7 @@ import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.view.View; import android.view.ViewGroup; import android.view.ViewGroupOverlay; diff --git a/src/com/android/messaging/ui/appsettings/ApnEditorActivity.java b/src/com/android/messaging/ui/appsettings/ApnEditorActivity.java index b7cb7ae..ae4b2eb 100644 --- a/src/com/android/messaging/ui/appsettings/ApnEditorActivity.java +++ b/src/com/android/messaging/ui/appsettings/ApnEditorActivity.java @@ -29,7 +29,7 @@ import android.preference.EditTextPreference; import android.preference.Preference; import android.preference.PreferenceFragment; import android.provider.Telephony; -import android.support.v4.app.NavUtils; +import androidx.core.app.NavUtils; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/appsettings/ApnSettingsActivity.java b/src/com/android/messaging/ui/appsettings/ApnSettingsActivity.java index 28dfc2a..8b4644e 100644 --- a/src/com/android/messaging/ui/appsettings/ApnSettingsActivity.java +++ b/src/com/android/messaging/ui/appsettings/ApnSettingsActivity.java @@ -35,7 +35,7 @@ import android.preference.PreferenceFragment; import android.preference.PreferenceGroup; import android.preference.PreferenceScreen; import android.provider.Telephony; -import android.support.v4.app.NavUtils; +import androidx.core.app.NavUtils; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/appsettings/ApplicationSettingsActivity.java b/src/com/android/messaging/ui/appsettings/ApplicationSettingsActivity.java index 906009f..d7abe85 100644 --- a/src/com/android/messaging/ui/appsettings/ApplicationSettingsActivity.java +++ b/src/com/android/messaging/ui/appsettings/ApplicationSettingsActivity.java @@ -30,7 +30,7 @@ import android.preference.PreferenceScreen; import android.preference.RingtonePreference; import android.preference.TwoStatePreference; import android.provider.Settings; -import android.support.v4.app.NavUtils; +import androidx.core.app.NavUtils; import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java b/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java index e02823f..623bc91 100644 --- a/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java +++ b/src/com/android/messaging/ui/appsettings/PerSubscriptionSettingsActivity.java @@ -28,7 +28,7 @@ import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceCategory; import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; -import android.support.v4.app.NavUtils; +import androidx.core.app.NavUtils; import android.text.TextUtils; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/appsettings/PhoneNumberPreference.java b/src/com/android/messaging/ui/appsettings/PhoneNumberPreference.java index 0c9c018..42ef606 100644 --- a/src/com/android/messaging/ui/appsettings/PhoneNumberPreference.java +++ b/src/com/android/messaging/ui/appsettings/PhoneNumberPreference.java @@ -18,8 +18,8 @@ package com.android.messaging.ui.appsettings; import android.content.Context; import android.preference.EditTextPreference; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicsCompat; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicsCompat; import android.text.InputType; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/src/com/android/messaging/ui/appsettings/SettingsActivity.java b/src/com/android/messaging/ui/appsettings/SettingsActivity.java index 75266d8..e8c05ec 100644 --- a/src/com/android/messaging/ui/appsettings/SettingsActivity.java +++ b/src/com/android/messaging/ui/appsettings/SettingsActivity.java @@ -19,7 +19,7 @@ package com.android.messaging.ui.appsettings; import android.app.Fragment; import android.content.Context; import android.os.Bundle; -import android.support.v4.app.NavUtils; +import androidx.core.app.NavUtils; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragment.java b/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragment.java index b39dc3e..75ea56d 100644 --- a/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragment.java +++ b/src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragment.java @@ -20,7 +20,7 @@ import android.content.Context; import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/contact/ContactDropdownLayouter.java b/src/com/android/messaging/ui/contact/ContactDropdownLayouter.java index 051ebeb..0caf6b7 100644 --- a/src/com/android/messaging/ui/contact/ContactDropdownLayouter.java +++ b/src/com/android/messaging/ui/contact/ContactDropdownLayouter.java @@ -18,8 +18,8 @@ package com.android.messaging.ui.contact; import android.content.Context; import android.graphics.drawable.StateListDrawable; import android.net.Uri; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicsCompat; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicsCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/messaging/ui/contact/ContactPickerFragment.java b/src/com/android/messaging/ui/contact/ContactPickerFragment.java index d803087..e201074 100644 --- a/src/com/android/messaging/ui/contact/ContactPickerFragment.java +++ b/src/com/android/messaging/ui/contact/ContactPickerFragment.java @@ -21,9 +21,9 @@ import android.app.Fragment; import android.database.Cursor; import android.graphics.Rect; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.Toolbar; -import android.support.v7.widget.Toolbar.OnMenuItemClickListener; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.Toolbar; +import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; diff --git a/src/com/android/messaging/ui/contact/ContactRecipientAdapter.java b/src/com/android/messaging/ui/contact/ContactRecipientAdapter.java index 1d91241..e330447 100644 --- a/src/com/android/messaging/ui/contact/ContactRecipientAdapter.java +++ b/src/com/android/messaging/ui/contact/ContactRecipientAdapter.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.contact; import android.content.Context; import android.database.Cursor; import android.database.MergeCursor; -import android.support.v4.util.Pair; +import androidx.core.util.Pair; import android.text.TextUtils; import android.text.util.Rfc822Token; import android.text.util.Rfc822Tokenizer; diff --git a/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java b/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java index c7c2731..dc13f22 100644 --- a/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java +++ b/src/com/android/messaging/ui/contact/ContactRecipientAutoCompleteView.java @@ -19,7 +19,7 @@ import android.content.Context; import android.database.Cursor; import android.graphics.Rect; import android.os.AsyncTask; -import android.support.v7.appcompat.R; +import androidx.appcompat.R; import android.text.Editable; import android.text.TextPaint; import android.text.TextWatcher; diff --git a/src/com/android/messaging/ui/conversation/ComposeMessageView.java b/src/com/android/messaging/ui/conversation/ComposeMessageView.java index 17f8f74..5db1292 100644 --- a/src/com/android/messaging/ui/conversation/ComposeMessageView.java +++ b/src/com/android/messaging/ui/conversation/ComposeMessageView.java @@ -20,7 +20,7 @@ import android.content.res.Resources; import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.text.Editable; import android.text.Html; import android.text.InputFilter; diff --git a/src/com/android/messaging/ui/conversation/ConversationActivity.java b/src/com/android/messaging/ui/conversation/ConversationActivity.java index 66310ea..be94460 100644 --- a/src/com/android/messaging/ui/conversation/ConversationActivity.java +++ b/src/com/android/messaging/ui/conversation/ConversationActivity.java @@ -22,7 +22,7 @@ import android.content.Intent; import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.text.TextUtils; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/conversation/ConversationFastScroller.java b/src/com/android/messaging/ui/conversation/ConversationFastScroller.java index b15f05a..f17f11e 100644 --- a/src/com/android/messaging/ui/conversation/ConversationFastScroller.java +++ b/src/com/android/messaging/ui/conversation/ConversationFastScroller.java @@ -23,10 +23,10 @@ import android.content.res.Resources; import android.graphics.Rect; import android.graphics.drawable.StateListDrawable; import android.os.Handler; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.AdapterDataObserver; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.util.StateSet; import android.view.LayoutInflater; import android.view.MotionEvent; diff --git a/src/com/android/messaging/ui/conversation/ConversationFragment.java b/src/com/android/messaging/ui/conversation/ConversationFragment.java index a6a191a..fbc6730 100644 --- a/src/com/android/messaging/ui/conversation/ConversationFragment.java +++ b/src/com/android/messaging/ui/conversation/ConversationFragment.java @@ -43,14 +43,14 @@ import android.os.Bundle; import android.os.Environment; import android.os.Handler; import android.os.Parcelable; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicsCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicsCompat; +import androidx.appcompat.app.ActionBar; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.text.TextUtils; import android.view.ActionMode; import android.view.Display; diff --git a/src/com/android/messaging/ui/conversation/ConversationInput.java b/src/com/android/messaging/ui/conversation/ConversationInput.java index bf60aa8..cf98dbe 100644 --- a/src/com/android/messaging/ui/conversation/ConversationInput.java +++ b/src/com/android/messaging/ui/conversation/ConversationInput.java @@ -16,7 +16,7 @@ package com.android.messaging.ui.conversation; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; /** * The base class for a method of user input, e.g. media picker. diff --git a/src/com/android/messaging/ui/conversation/ConversationInputManager.java b/src/com/android/messaging/ui/conversation/ConversationInputManager.java index e10abe7..3d42d78 100644 --- a/src/com/android/messaging/ui/conversation/ConversationInputManager.java +++ b/src/com/android/messaging/ui/conversation/ConversationInputManager.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.conversation; import android.app.FragmentManager; import android.content.Context; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.widget.EditText; import com.android.messaging.R; diff --git a/src/com/android/messaging/ui/conversation/ConversationMessageAdapter.java b/src/com/android/messaging/ui/conversation/ConversationMessageAdapter.java index 2748fff..fb04bb4 100644 --- a/src/com/android/messaging/ui/conversation/ConversationMessageAdapter.java +++ b/src/com/android/messaging/ui/conversation/ConversationMessageAdapter.java @@ -17,7 +17,7 @@ package com.android.messaging.ui.conversation; import android.content.Context; import android.database.Cursor; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/messaging/ui/conversation/ConversationMessageView.java b/src/com/android/messaging/ui/conversation/ConversationMessageView.java index 0bfb960..20c986d 100644 --- a/src/com/android/messaging/ui/conversation/ConversationMessageView.java +++ b/src/com/android/messaging/ui/conversation/ConversationMessageView.java @@ -21,7 +21,7 @@ import android.database.Cursor; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.Spanned; import android.text.TextUtils; import android.text.format.DateUtils; diff --git a/src/com/android/messaging/ui/conversation/ConversationSimSelector.java b/src/com/android/messaging/ui/conversation/ConversationSimSelector.java index fc43a46..94c7e76 100644 --- a/src/com/android/messaging/ui/conversation/ConversationSimSelector.java +++ b/src/com/android/messaging/ui/conversation/ConversationSimSelector.java @@ -16,7 +16,7 @@ package com.android.messaging.ui.conversation; import android.content.Context; -import android.support.v4.util.Pair; +import androidx.core.util.Pair; import android.text.TextUtils; import com.android.messaging.Factory; diff --git a/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java b/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java index dbbbb15..f3de0ab 100644 --- a/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java +++ b/src/com/android/messaging/ui/conversationlist/AbstractConversationListActivity.java @@ -24,7 +24,7 @@ import android.content.Intent; import android.content.res.Resources; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.android.messaging.R; diff --git a/src/com/android/messaging/ui/conversationlist/ArchivedConversationListActivity.java b/src/com/android/messaging/ui/conversationlist/ArchivedConversationListActivity.java index 366c7d3..342c970 100644 --- a/src/com/android/messaging/ui/conversationlist/ArchivedConversationListActivity.java +++ b/src/com/android/messaging/ui/conversationlist/ArchivedConversationListActivity.java @@ -17,7 +17,7 @@ package com.android.messaging.ui.conversationlist; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.view.Menu; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListActivity.java b/src/com/android/messaging/ui/conversationlist/ConversationListActivity.java index f8abe81..636b0f5 100644 --- a/src/com/android/messaging/ui/conversationlist/ConversationListActivity.java +++ b/src/com/android/messaging/ui/conversationlist/ConversationListActivity.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.conversationlist; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.view.Menu; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListAdapter.java b/src/com/android/messaging/ui/conversationlist/ConversationListAdapter.java index 629c4ae..fc687eb 100644 --- a/src/com/android/messaging/ui/conversationlist/ConversationListAdapter.java +++ b/src/com/android/messaging/ui/conversationlist/ConversationListAdapter.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.conversationlist; import android.content.Context; import android.database.Cursor; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; @@ -43,7 +43,7 @@ public class ConversationListAdapter /** * @see com.android.messaging.ui.CursorRecyclerAdapter#bindViewHolder( - * android.support.v7.widget.RecyclerView.ViewHolder, android.content.Context, + * androidx.recyclerview.widget.RecyclerView.ViewHolder, android.content.Context, * android.database.Cursor) */ @Override diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java b/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java index 2f868d4..269efcb 100644 --- a/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java +++ b/src/com/android/messaging/ui/conversationlist/ConversationListFragment.java @@ -23,10 +23,10 @@ import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; import android.os.Parcelable; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.ViewGroupCompat; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.core.view.ViewCompat; +import androidx.core.view.ViewGroupCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListItemView.java b/src/com/android/messaging/ui/conversationlist/ConversationListItemView.java index 6b02eb3..b22ccfc 100644 --- a/src/com/android/messaging/ui/conversationlist/ConversationListItemView.java +++ b/src/com/android/messaging/ui/conversationlist/ConversationListItemView.java @@ -22,8 +22,8 @@ import android.graphics.Color; import android.graphics.Rect; import android.graphics.Typeface; import android.net.Uri; -import android.support.v4.text.BidiFormatter; -import android.support.v4.text.TextDirectionHeuristicsCompat; +import androidx.core.text.BidiFormatter; +import androidx.core.text.TextDirectionHeuristicsCompat; import android.text.TextPaint; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/src/com/android/messaging/ui/conversationlist/ConversationListSwipeHelper.java b/src/com/android/messaging/ui/conversationlist/ConversationListSwipeHelper.java index 4988259..e5859a6 100644 --- a/src/com/android/messaging/ui/conversationlist/ConversationListSwipeHelper.java +++ b/src/com/android/messaging/ui/conversationlist/ConversationListSwipeHelper.java @@ -21,9 +21,9 @@ import android.animation.ObjectAnimator; import android.animation.TimeInterpolator; import android.content.Context; import android.content.res.Resources; -import android.support.v4.view.ViewCompat; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.OnItemTouchListener; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener; import android.view.MotionEvent; import android.view.VelocityTracker; import android.view.View; diff --git a/src/com/android/messaging/ui/conversationlist/MultiSelectActionModeCallback.java b/src/com/android/messaging/ui/conversationlist/MultiSelectActionModeCallback.java index bfeec51..64d1436 100644 --- a/src/com/android/messaging/ui/conversationlist/MultiSelectActionModeCallback.java +++ b/src/com/android/messaging/ui/conversationlist/MultiSelectActionModeCallback.java @@ -15,7 +15,7 @@ */ package com.android.messaging.ui.conversationlist; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import android.text.TextUtils; import android.view.ActionMode; import android.view.ActionMode.Callback; diff --git a/src/com/android/messaging/ui/conversationlist/ShareIntentAdapter.java b/src/com/android/messaging/ui/conversationlist/ShareIntentAdapter.java index e894145..6d465ee 100644 --- a/src/com/android/messaging/ui/conversationlist/ShareIntentAdapter.java +++ b/src/com/android/messaging/ui/conversationlist/ShareIntentAdapter.java @@ -20,7 +20,7 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.net.Uri; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; diff --git a/src/com/android/messaging/ui/conversationlist/ShareIntentFragment.java b/src/com/android/messaging/ui/conversationlist/ShareIntentFragment.java index bc549ea..beafb53 100644 --- a/src/com/android/messaging/ui/conversationlist/ShareIntentFragment.java +++ b/src/com/android/messaging/ui/conversationlist/ShareIntentFragment.java @@ -24,8 +24,8 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.database.Cursor; import android.os.Bundle; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/messaging/ui/conversationsettings/PeopleOptionsItemView.java b/src/com/android/messaging/ui/conversationsettings/PeopleOptionsItemView.java index 42ecfeb..5b6f3b0 100644 --- a/src/com/android/messaging/ui/conversationsettings/PeopleOptionsItemView.java +++ b/src/com/android/messaging/ui/conversationsettings/PeopleOptionsItemView.java @@ -17,7 +17,7 @@ package com.android.messaging.ui.conversationsettings; import android.content.Context; import android.database.Cursor; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.widget.SwitchCompat; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/src/com/android/messaging/ui/mediapicker/CameraManager.java b/src/com/android/messaging/ui/mediapicker/CameraManager.java index 166ebd7..835fab3 100644 --- a/src/com/android/messaging/ui/mediapicker/CameraManager.java +++ b/src/com/android/messaging/ui/mediapicker/CameraManager.java @@ -28,7 +28,7 @@ import android.media.MediaRecorder; import android.net.Uri; import android.os.AsyncTask; import android.os.Looper; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.MotionEvent; diff --git a/src/com/android/messaging/ui/mediapicker/GalleryGridView.java b/src/com/android/messaging/ui/mediapicker/GalleryGridView.java index a5a7dad..2265dd5 100644 --- a/src/com/android/messaging/ui/mediapicker/GalleryGridView.java +++ b/src/com/android/messaging/ui/mediapicker/GalleryGridView.java @@ -20,7 +20,7 @@ import android.graphics.Rect; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import android.util.AttributeSet; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/mediapicker/GalleryMediaChooser.java b/src/com/android/messaging/ui/mediapicker/GalleryMediaChooser.java index 9422386..1b8c2dc 100644 --- a/src/com/android/messaging/ui/mediapicker/GalleryMediaChooser.java +++ b/src/com/android/messaging/ui/mediapicker/GalleryMediaChooser.java @@ -21,7 +21,7 @@ import android.content.pm.PackageManager; import android.database.Cursor; import android.database.MatrixCursor; import android.database.MergeCursor; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/mediapicker/MediaChooser.java b/src/com/android/messaging/ui/mediapicker/MediaChooser.java index 9ac0d1b..ef4067c 100644 --- a/src/com/android/messaging/ui/mediapicker/MediaChooser.java +++ b/src/com/android/messaging/ui/mediapicker/MediaChooser.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.mediapicker; import android.app.FragmentManager; import android.content.Context; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/mediapicker/MediaPicker.java b/src/com/android/messaging/ui/mediapicker/MediaPicker.java index f441d09..8e5198b 100644 --- a/src/com/android/messaging/ui/mediapicker/MediaPicker.java +++ b/src/com/android/messaging/ui/mediapicker/MediaPicker.java @@ -23,9 +23,9 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.ActionBar; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.ActionBar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/com/android/messaging/ui/photoviewer/BuglePhotoBitmapLoader.java b/src/com/android/messaging/ui/photoviewer/BuglePhotoBitmapLoader.java index d139a38..9911456 100644 --- a/src/com/android/messaging/ui/photoviewer/BuglePhotoBitmapLoader.java +++ b/src/com/android/messaging/ui/photoviewer/BuglePhotoBitmapLoader.java @@ -19,7 +19,7 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.net.Uri; import android.support.rastermill.FrameSequenceDrawable; -import android.support.v4.content.AsyncTaskLoader; +import androidx.loader.content.AsyncTaskLoader; import com.android.ex.photo.PhotoViewController; import com.android.ex.photo.loaders.PhotoBitmapLoaderInterface; diff --git a/src/com/android/messaging/ui/photoviewer/BuglePhotoPageAdapter.java b/src/com/android/messaging/ui/photoviewer/BuglePhotoPageAdapter.java index 52498c7..c19070b 100644 --- a/src/com/android/messaging/ui/photoviewer/BuglePhotoPageAdapter.java +++ b/src/com/android/messaging/ui/photoviewer/BuglePhotoPageAdapter.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.photoviewer; import android.content.Context; import android.content.Intent; import android.database.Cursor; -import android.support.v4.app.FragmentManager; +import androidx.fragment.app.FragmentManager; import com.android.ex.photo.adapters.PhotoPagerAdapter; import com.android.ex.photo.fragments.PhotoViewFragment; diff --git a/src/com/android/messaging/ui/photoviewer/BuglePhotoViewController.java b/src/com/android/messaging/ui/photoviewer/BuglePhotoViewController.java index eb39886..0bb8f11 100644 --- a/src/com/android/messaging/ui/photoviewer/BuglePhotoViewController.java +++ b/src/com/android/messaging/ui/photoviewer/BuglePhotoViewController.java @@ -23,8 +23,8 @@ import android.content.Intent; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.FragmentManager; -import android.support.v4.content.Loader; +import androidx.fragment.app.FragmentManager; +import androidx.loader.content.Loader; import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; diff --git a/src/com/android/messaging/ui/photoviewer/BuglePhotoViewFragment.java b/src/com/android/messaging/ui/photoviewer/BuglePhotoViewFragment.java index 698c510..a6293dc 100644 --- a/src/com/android/messaging/ui/photoviewer/BuglePhotoViewFragment.java +++ b/src/com/android/messaging/ui/photoviewer/BuglePhotoViewFragment.java @@ -18,7 +18,7 @@ package com.android.messaging.ui.photoviewer; import android.content.Intent; import android.graphics.drawable.Drawable; import android.support.rastermill.FrameSequenceDrawable; -import android.support.v4.content.Loader; +import androidx.loader.content.Loader; import com.android.ex.photo.PhotoViewCallbacks; import com.android.ex.photo.fragments.PhotoViewFragment; diff --git a/src/com/android/messaging/util/AccessibilityUtil.java b/src/com/android/messaging/util/AccessibilityUtil.java index f6c64a9..788f482 100644 --- a/src/com/android/messaging/util/AccessibilityUtil.java +++ b/src/com/android/messaging/util/AccessibilityUtil.java @@ -17,8 +17,8 @@ package com.android.messaging.util; import android.content.Context; import android.content.res.Resources; -import android.support.v4.view.accessibility.AccessibilityEventCompat; -import android.support.v4.view.accessibility.AccessibilityRecordCompat; +import androidx.core.view.accessibility.AccessibilityEventCompat; +import androidx.core.view.accessibility.AccessibilityRecordCompat; import android.text.TextUtils; import android.view.View; import android.view.accessibility.AccessibilityEvent; diff --git a/src/com/android/messaging/util/AvatarUriUtil.java b/src/com/android/messaging/util/AvatarUriUtil.java index df7d085..b6c65e3 100644 --- a/src/com/android/messaging/util/AvatarUriUtil.java +++ b/src/com/android/messaging/util/AvatarUriUtil.java @@ -18,8 +18,8 @@ package com.android.messaging.util; import android.graphics.Color; import android.net.Uri; import android.net.Uri.Builder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.android.messaging.datamodel.data.ParticipantData; diff --git a/src/com/android/messaging/util/ImageUtils.java b/src/com/android/messaging/util/ImageUtils.java index 05d3678..5e20e7b 100644 --- a/src/com/android/messaging/util/ImageUtils.java +++ b/src/com/android/messaging/util/ImageUtils.java @@ -32,7 +32,7 @@ import android.graphics.Shader.TileMode; import android.graphics.drawable.Drawable; import android.net.Uri; import android.provider.MediaStore; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.View; diff --git a/src/com/android/messaging/util/ImeUtil.java b/src/com/android/messaging/util/ImeUtil.java index ab0df13..3f033d0 100644 --- a/src/com/android/messaging/util/ImeUtil.java +++ b/src/com/android/messaging/util/ImeUtil.java @@ -16,7 +16,7 @@ package com.android.messaging.util; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.inputmethod.InputMethodManager; diff --git a/src/com/android/messaging/util/LongSparseSet.java b/src/com/android/messaging/util/LongSparseSet.java index 8e2cfca..bb3843e 100644 --- a/src/com/android/messaging/util/LongSparseSet.java +++ b/src/com/android/messaging/util/LongSparseSet.java @@ -16,7 +16,7 @@ package com.android.messaging.util; -import android.support.v4.util.LongSparseArray; +import androidx.collection.LongSparseArray; /** * A space saving set for long values using v4 compat LongSparseArray diff --git a/src/com/android/messaging/util/OsUtil.java b/src/com/android/messaging/util/OsUtil.java index 4890d08..1d9742a 100644 --- a/src/com/android/messaging/util/OsUtil.java +++ b/src/com/android/messaging/util/OsUtil.java @@ -22,7 +22,7 @@ import android.content.pm.PackageManager; import android.os.Build; import android.os.UserHandle; import android.os.UserManager; -import android.support.v4.os.BuildCompat; +import androidx.core.os.BuildCompat; import com.android.messaging.Factory; diff --git a/src/com/android/messaging/util/PhoneUtils.java b/src/com/android/messaging/util/PhoneUtils.java index 726f083..671c65e 100644 --- a/src/com/android/messaging/util/PhoneUtils.java +++ b/src/com/android/messaging/util/PhoneUtils.java @@ -26,7 +26,7 @@ import android.database.Cursor; import android.net.ConnectivityManager; import android.provider.Settings; import android.provider.Telephony; -import android.support.v4.util.ArrayMap; +import androidx.collection.ArrayMap; import android.telephony.PhoneNumberUtils; import android.telephony.SmsManager; import android.telephony.SubscriptionInfo; diff --git a/src/com/android/messaging/util/SwitchCompatUtils.java b/src/com/android/messaging/util/SwitchCompatUtils.java index b5d1ed5..8cfe2bc 100644 --- a/src/com/android/messaging/util/SwitchCompatUtils.java +++ b/src/com/android/messaging/util/SwitchCompatUtils.java @@ -21,12 +21,12 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.v7.graphics.drawable.DrawableWrapper; -import android.support.v7.widget.SwitchCompat; +import androidx.appcompat.graphics.drawable.DrawableWrapper; +import androidx.appcompat.widget.SwitchCompat; import android.util.TypedValue; /* Most methods in this file are copied from - * v7/appcompat/src/android/support/v7/internal/widget/TintManager.java. It would be better if + * v7/appcompat/src/androidx.appcompat.internal/widget/TintManager.java. It would be better if * we could have just extended the TintManager but this is a final class that we do not have * access to. */ @@ -78,7 +78,7 @@ public class SwitchCompatUtils { // Default enabled state states[i] = new int[0]; colors[i] = getThemeAttrColor(context, typedValue, - android.support.v7.appcompat.R.attr.colorSwitchThumbNormal); + androidx.appcompat.R.attr.colorSwitchThumbNormal); i++; return new ColorStateList(states, colors); } diff --git a/src/com/android/messaging/util/TextUtil.java b/src/com/android/messaging/util/TextUtil.java index b240396..f715551 100644 --- a/src/com/android/messaging/util/TextUtil.java +++ b/src/com/android/messaging/util/TextUtil.java @@ -15,7 +15,7 @@ */ package com.android.messaging.util; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public class TextUtil { /** diff --git a/src/com/android/messaging/util/TintDrawableWrapper.java b/src/com/android/messaging/util/TintDrawableWrapper.java index e6ea4bd..06ee7d4 100644 --- a/src/com/android/messaging/util/TintDrawableWrapper.java +++ b/src/com/android/messaging/util/TintDrawableWrapper.java @@ -20,10 +20,10 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.v7.graphics.drawable.DrawableWrapper; +import androidx.appcompat.graphics.drawable.DrawableWrapper; /* - * This is directly copied from v7/appcompat/src/android/support/v7/internal/widget/TintManager.java + * This is directly copied from v7/appcompat/src/androidx.appcompat.internal/widget/TintManager.java */ /** diff --git a/src/com/android/messaging/util/UiUtils.java b/src/com/android/messaging/util/UiUtils.java index e446c73..6e0c16e 100644 --- a/src/com/android/messaging/util/UiUtils.java +++ b/src/com/android/messaging/util/UiUtils.java @@ -24,10 +24,10 @@ import android.content.res.Configuration; import android.graphics.Color; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.text.Html; import android.text.Spanned; import android.text.TextPaint; @@ -376,7 +376,7 @@ public class UiUtils { activity.getResources().getDimensionPixelSize(R.dimen.action_bar_elevation) : 0); final View actionBarView = activity.getWindow().getDecorView().findViewById( - android.support.v7.appcompat.R.id.decor_content_parent); + androidx.appcompat.R.id.decor_content_parent); if (actionBarView != null) { // AppCompatActionBar has one drawable Field, which is the shadow for the action bar // set the alpha on that drawable manually diff --git a/src/com/android/messaging/util/UriUtil.java b/src/com/android/messaging/util/UriUtil.java index 7cd6062..0e931c4 100644 --- a/src/com/android/messaging/util/UriUtil.java +++ b/src/com/android/messaging/util/UriUtil.java @@ -22,7 +22,7 @@ import android.media.MediaMetadataRetriever; import android.net.Uri; import android.os.ParcelFileDescriptor; import android.provider.MediaStore; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.android.messaging.Factory; |