Migrate Messaging to androidx.

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

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

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

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

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;