Migrate EasterEgg, JankBench, UiBench to androidx

Bug: 76692459
Test: make -j EasterEgg JankBench UiBench
Change-Id: Id9bed936dd1cb1cb4e1c0792618c9a3d608c1fb8

7 files changed, 22 insertions, 22 deletions

diff --git a/packages/EasterEgg/Android.mk b/packages/EasterEgg/Android.mk
index 605a75d16977..8fa4d6a3bfc8 100644
--- a/packages/EasterEgg/Android.mk
+++ b/packages/EasterEgg/Android.mk
@@ -7,13 +7,13 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     jsr305
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-    android-support-v4 \
-    android-support-v13 \
-    android-support-dynamic-animation \
-    android-support-v7-recyclerview \
-    android-support-v7-preference \
-    android-support-v7-appcompat \
-    android-support-v14-preference
+    androidx.legacy_legacy-support-v4 \
+    androidx.legacy_legacy-support-v13 \
+    androidx.dynamicanimation_dynamicanimation \
+    androidx.recyclerview_recyclerview \
+    androidx.preference_preference \
+    androidx.appcompat_appcompat \
+    androidx.legacy_legacy-preference-v14
 
 LOCAL_USE_AAPT2 := true
 
diff --git a/packages/EasterEgg/AndroidManifest.xml b/packages/EasterEgg/AndroidManifest.xml
index 172490dc9178..e8ea32b5b5a8 100644
--- a/packages/EasterEgg/AndroidManifest.xml
+++ b/packages/EasterEgg/AndroidManifest.xml
@@ -87,7 +87,7 @@ Copyright (C) 2016 The Android Open Source Project
 
         <!-- FileProvider for sending pictures -->
         <provider
-                android:name="android.support.v4.content.FileProvider"
+                android:name="androidx.core.content.FileProvider"
                 android:authorities="com.android.egg.fileprovider"
                 android:grantUriPermissions="true"
                 android:exported="false">
diff --git a/packages/EasterEgg/res/layout/neko_activity.xml b/packages/EasterEgg/res/layout/neko_activity.xml
index 21a4600bae40..c258137ca710 100644
--- a/packages/EasterEgg/res/layout/neko_activity.xml
+++ b/packages/EasterEgg/res/layout/neko_activity.xml
@@ -17,7 +17,7 @@ Copyright (C) 2016 The Android Open Source Project
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="match_parent"
              android:layout_height="match_parent">
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/packages/EasterEgg/src/com/android/egg/neko/NekoDialog.java b/packages/EasterEgg/src/com/android/egg/neko/NekoDialog.java
index 2d2fbe8207af..ee89041ae868 100644
--- a/packages/EasterEgg/src/com/android/egg/neko/NekoDialog.java
+++ b/packages/EasterEgg/src/com/android/egg/neko/NekoDialog.java
@@ -14,11 +14,11 @@
 
 package com.android.egg.neko;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.app.Dialog;
 import android.content.Context;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/packages/EasterEgg/src/com/android/egg/neko/NekoLand.java b/packages/EasterEgg/src/com/android/egg/neko/NekoLand.java
index d2e37d8779d1..ceb21708d02f 100644
--- a/packages/EasterEgg/src/com/android/egg/neko/NekoLand.java
+++ b/packages/EasterEgg/src/com/android/egg/neko/NekoLand.java
@@ -31,9 +31,9 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.provider.MediaStore.Images;
-import android.support.v4.content.FileProvider;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.content.FileProvider;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
diff --git a/packages/EasterEgg/src/com/android/egg/neko/NekoLockedActivity.java b/packages/EasterEgg/src/com/android/egg/neko/NekoLockedActivity.java
index 5f01da879ebb..e0876a4e87ed 100644
--- a/packages/EasterEgg/src/com/android/egg/neko/NekoLockedActivity.java
+++ b/packages/EasterEgg/src/com/android/egg/neko/NekoLockedActivity.java
@@ -14,7 +14,7 @@
 
 package com.android.egg.neko;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnDismissListener;
diff --git a/packages/EasterEgg/src/com/android/egg/octo/OctopusDrawable.java b/packages/EasterEgg/src/com/android/egg/octo/OctopusDrawable.java
index 5dde6e115268..4f8c11b690a8 100644
--- a/packages/EasterEgg/src/com/android/egg/octo/OctopusDrawable.java
+++ b/packages/EasterEgg/src/com/android/egg/octo/OctopusDrawable.java
@@ -26,12 +26,12 @@ import android.graphics.PixelFormat;
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.animation.DynamicAnimation;
-import android.support.animation.SpringForce;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.animation.SpringAnimation;
-import android.support.animation.FloatValueHolder;
+import androidx.dynamicanimation.animation.DynamicAnimation;
+import androidx.dynamicanimation.animation.SpringForce;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.dynamicanimation.animation.SpringAnimation;
+import androidx.dynamicanimation.animation.FloatValueHolder;
 
 public class OctopusDrawable extends Drawable {
     private static float BASE_SCALE = 100f;