Migrate Messaging to androidx.

Test: make messaging
Bug: 76692459
Change-Id: I9103450622f129311545648ac75f5b2f9fc2d04a
Merged-In: I9103450622f129311545648ac75f5b2f9fc2d04a

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;

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;

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;

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

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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.

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;

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;

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;

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;

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;

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;
 

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;
 

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

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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

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;
 

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;

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

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