Migrate Messaging to androidx.

am: 1b693ea7df

Change-Id: Ib82fc411e687738b85c96259765ec170c245b4bd

Android.mk

@@ -23,21 +23,21 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 LOCAL_USE_AAPT2 := true
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-compat \
-    android-support-media-compat \
-    android-support-core-utils \
-    android-support-core-ui \
-    android-support-fragment \
-    android-support-v7-appcompat \
-    android-support-v7-palette \
-    android-support-v7-recyclerview \
-    android-support-v13 \
+    androidx.core_core \
+    androidx.media_media \
+    androidx.legacy_legacy-support-core-utils \
+    androidx.legacy_legacy-support-core-ui \
+    androidx.fragment_fragment \
+    androidx.appcompat_appcompat \
+    androidx.palette_palette \
+    androidx.recyclerview_recyclerview \
+    androidx.legacy_legacy-support-v13 \
     colorpicker \
     libchips \
     libphotoviewer
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-annotations \
+    androidx.annotation_annotation \
     android-common \
     android-common-framesequence \
     com.android.vcard \

AndroidManifest.xml

@@ -520,7 +520,7 @@
             </intent-filter>
         </activity>
 
-        <service android:name="android.support.v7.mms.MmsService"/>
+        <service android:name="androidx.appcompat.mms.MmsService"/>
     </application>
 
 </manifest>

proguard.flags

@@ -35,13 +35,13 @@
 -keep public class * extends android.content.ContentProvider
 -keep public class * extends android.app.backup.BackupAgentHelper
 -keep public class * extends android.preference.Preference
--keep public class * extends android.support.v4.app.Fragment
+-keep public class * extends androidx.fragment.app.Fragment
 -keep public class com.android.vcard.* { *; }
 
--keep class android.support.v4.* { *; }
--keep class android.support.v4.*.* { *; }
--keep class android.support.v7.* { *; }
--keep class android.support.v7.*.* { *; }
+-keep class androidx.core.* { *; }
+-keep class androidx.core.*.* { *; }
+-keep class androidx.appcompat.* { *; }
+-keep class androidx.appcompat.*.* { *; }
 
 # Keep rastermill classes that need to be accessed from native code (JNI)
 -keep class android.support.rastermill.** { *; }

res/layout/contact_picker_fragment.xml

@@ -21,7 +21,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
@@ -58,7 +58,7 @@
 
         </com.android.messaging.ui.MaxHeightScrollView>
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <FrameLayout
         android:layout_width="match_parent"

res/layout/conversation_fragment.xml

@@ -34,7 +34,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1" >
             <!-- Message list -->
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@android:id/list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

res/layout/conversation_list_fragment.xml

@@ -20,7 +20,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

res/layout/custom_header_view_pager.xml

@@ -30,7 +30,7 @@
         android:layout_height="0dp"
         android:layout_weight="1">
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />

res/layout/people_options_item_view.xml

@@ -53,7 +53,7 @@
 
     </LinearLayout>
 
-    <android.support.v7.widget.SwitchCompat
+    <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/switch_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

res/layout/share_intent_conversation_list_view.xml

@@ -24,7 +24,7 @@
       android:layout_width="match_parent"
       android:layout_height="0dp"
       android:layout_weight="1">
-      <android.support.v7.widget.RecyclerView
+      <androidx.recyclerview.widget.RecyclerView
           android:id="@android:id/list"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"

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

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;
 

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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

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;

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

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;

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;

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;

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;
 

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;

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;

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

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;

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.

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 {
     /**

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;

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;
 

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.

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;
 

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 {
     /**

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.

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.

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.

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.

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.

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;

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 {
     /**

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;

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;
 

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;
 

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;
 

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 {
     /**

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 {
     /**

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.

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 {
     /**

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;
 

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;

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;
 

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;

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;

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;

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;

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;

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;
 

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;

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;
 

src/com/android/messaging/datamodel/SyncManager.java

@@ -20,7 +20,7 @@ import android.content.Context;
 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;

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;

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;

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;

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;

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;
 

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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> {

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;
 

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;

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;
 

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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);
 

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;

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;
 

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;
 

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;

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;

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;