diff options
65 files changed, 160 insertions, 159 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; diff --git a/tests/JankBench/Android.mk b/tests/JankBench/Android.mk index 291ba78758b4..75282ba9a88c 100644 --- a/tests/JankBench/Android.mk +++ b/tests/JankBench/Android.mk @@ -19,12 +19,12 @@ LOCAL_RESOURCE_DIR := \ LOCAL_STATIC_ANDROID_LIBRARIES := \ - $(ANDROID_SUPPORT_DESIGN_TARGETS) \ - android-support-v4 \ - android-support-v7-appcompat \ - android-support-v7-cardview \ - android-support-v7-recyclerview \ - android-support-v17-leanback \ + androidx.design_design \ + androidx.legacy_legacy-support-v4 \ + androidx.appcompat_appcompat \ + androidx.cardview_cardview \ + androidx.recyclerview_recyclerview \ + androidx.leanback_leanback \ LOCAL_STATIC_JAVA_LIBRARIES := \ apache-commons-math \ diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/app/BenchmarkDashboardFragment.java b/tests/JankBench/app/src/main/java/com/android/benchmark/app/BenchmarkDashboardFragment.java index b0a97ae0995b..c5edd7ae75e0 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/app/BenchmarkDashboardFragment.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/app/BenchmarkDashboardFragment.java @@ -16,7 +16,7 @@ package com.android.benchmark.app; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/app/HomeActivity.java b/tests/JankBench/app/src/main/java/com/android/benchmark/app/HomeActivity.java index 79bafd62e2a2..47db6020b36f 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/app/HomeActivity.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/app/HomeActivity.java @@ -20,8 +20,8 @@ import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; import android.support.design.widget.FloatingActionButton; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.Menu; diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/app/RunLocalBenchmarksActivity.java b/tests/JankBench/app/src/main/java/com/android/benchmark/app/RunLocalBenchmarksActivity.java index 7641d0095a70..07c4a938cf9f 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/app/RunLocalBenchmarksActivity.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/app/RunLocalBenchmarksActivity.java @@ -20,10 +20,10 @@ import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.app.ListFragment; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.fragment.app.ListFragment; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/app/UiResultsFragment.java b/tests/JankBench/app/src/main/java/com/android/benchmark/app/UiResultsFragment.java index 56e94d538ab5..68aeb4ccd06d 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/app/UiResultsFragment.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/app/UiResultsFragment.java @@ -19,8 +19,8 @@ package com.android.benchmark.app; import android.annotation.TargetApi; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.ListFragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.ListFragment; import android.util.Log; import android.view.FrameMetrics; import android.widget.SimpleAdapter; diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/registry/BenchmarkCategory.java b/tests/JankBench/app/src/main/java/com/android/benchmark/registry/BenchmarkCategory.java index d91e5798f05b..d13b5692c6b8 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/registry/BenchmarkCategory.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/registry/BenchmarkCategory.java @@ -16,7 +16,7 @@ package com.android.benchmark.registry; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/BitmapUploadActivity.java b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/BitmapUploadActivity.java index f6a528a8a966..787090208d7e 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/BitmapUploadActivity.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/BitmapUploadActivity.java @@ -25,7 +25,7 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Rect; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.view.MotionEvent; diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/EditTextInputActivity.java b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/EditTextInputActivity.java index ea6fb58f4775..3817ab50e120 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/EditTextInputActivity.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/EditTextInputActivity.java @@ -18,8 +18,8 @@ package com.android.benchmark.ui; import android.content.Intent; 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.KeyEvent; import android.widget.EditText; diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/FullScreenOverdrawActivity.java b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/FullScreenOverdrawActivity.java index 95fce3834f9b..c508bf99ffba 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/FullScreenOverdrawActivity.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/FullScreenOverdrawActivity.java @@ -23,7 +23,7 @@ import android.content.Intent; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.view.MotionEvent; import android.view.View; diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/ListActivityBase.java b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/ListActivityBase.java index b973bc76c13f..7d7b04c27f84 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/ListActivityBase.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/ListActivityBase.java @@ -18,9 +18,9 @@ package com.android.benchmark.ui; import android.app.ActionBar; import android.os.Bundle; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.ListFragment; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.ListFragment; +import androidx.appcompat.app.AppCompatActivity; import android.view.Window; import android.widget.ListAdapter; diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/ListViewScrollActivity.java b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/ListViewScrollActivity.java index 3ffb7706675f..8b3a96374de6 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/ListViewScrollActivity.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/ListViewScrollActivity.java @@ -18,7 +18,7 @@ package com.android.benchmark.ui; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; import android.view.FrameMetrics; import android.view.MotionEvent; import android.widget.ArrayAdapter; diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/ShadowGridActivity.java b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/ShadowGridActivity.java index 68f75a3f277b..c96899b136d0 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/ShadowGridActivity.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/ShadowGridActivity.java @@ -17,9 +17,9 @@ package com.android.benchmark.ui; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.ListFragment; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.ListFragment; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.ArrayAdapter; import android.widget.ListView; diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/automation/FrameTimingStats.java b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/automation/FrameTimingStats.java index 1fd0998f8dd6..bf882dc83c89 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/automation/FrameTimingStats.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/automation/FrameTimingStats.java @@ -16,7 +16,7 @@ package com.android.benchmark.ui.automation; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.io.DataInput; import java.io.DataInputStream; diff --git a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/automation/Interaction.java b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/automation/Interaction.java index 370fed28e1b2..31a26698c6d2 100644 --- a/tests/JankBench/app/src/main/java/com/android/benchmark/ui/automation/Interaction.java +++ b/tests/JankBench/app/src/main/java/com/android/benchmark/ui/automation/Interaction.java @@ -17,7 +17,7 @@ package com.android.benchmark.ui.automation; import android.os.SystemClock; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import android.view.MotionEvent; import java.util.ArrayList; diff --git a/tests/JankBench/app/src/main/res/layout/activity_bitmap_upload.xml b/tests/JankBench/app/src/main/res/layout/activity_bitmap_upload.xml index 6b3c8992d414..15cd0a4c528e 100644 --- a/tests/JankBench/app/src/main/res/layout/activity_bitmap_upload.xml +++ b/tests/JankBench/app/src/main/res/layout/activity_bitmap_upload.xml @@ -22,7 +22,7 @@ android:layout_height="match_parent" android:padding="10dp" android:clipToPadding="false"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1"> @@ -30,22 +30,22 @@ android:id="@+id/upload_view" android:layout_width="match_parent" android:layout_height="match_parent"/> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> - <android.support.v4.widget.Space + <androidx.legacy.widget.Space android:layout_height="10dp" android:layout_width="match_parent" /> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" /> - <android.support.v4.widget.Space + <androidx.legacy.widget.Space android:layout_height="10dp" android:layout_width="match_parent" /> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" /> diff --git a/tests/JankBench/app/src/main/res/layout/activity_home.xml b/tests/JankBench/app/src/main/res/layout/activity_home.xml index c4f429922aab..fb3074742f5c 100644 --- a/tests/JankBench/app/src/main/res/layout/activity_home.xml +++ b/tests/JankBench/app/src/main/res/layout/activity_home.xml @@ -15,7 +15,7 @@ ~ --> -<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" @@ -39,4 +39,4 @@ <include layout="@layout/content_main" /> -</android.support.design.widget.CoordinatorLayout> +</androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/tests/JankBench/app/src/main/res/layout/card_row.xml b/tests/JankBench/app/src/main/res/layout/card_row.xml index 215f9df9b7fd..9ebff8e2d6ca 100644 --- a/tests/JankBench/app/src/main/res/layout/card_row.xml +++ b/tests/JankBench/app/src/main/res/layout/card_row.xml @@ -24,7 +24,7 @@ android:paddingBottom="5dp" android:clipToPadding="false" android:background="@null"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1"> @@ -32,13 +32,13 @@ android:id="@+id/card_text" android:layout_width="match_parent" android:layout_height="match_parent"/> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> - <android.support.v4.widget.Space + <androidx.legacy.widget.Space android:layout_height="match_parent" android:layout_width="10dp" /> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" /> diff --git a/tests/JankBench/app/src/main/res/layout/fragment_dashboard.xml b/tests/JankBench/app/src/main/res/layout/fragment_dashboard.xml index f3100c7ea75d..3c72dc96a8d9 100644 --- a/tests/JankBench/app/src/main/res/layout/fragment_dashboard.xml +++ b/tests/JankBench/app/src/main/res/layout/fragment_dashboard.xml @@ -15,7 +15,7 @@ ~ --> -<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/main_content" android:layout_width="match_parent" @@ -39,7 +39,7 @@ app:expandedTitleMarginStart="48dp" app:expandedTitleMarginEnd="64dp"> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" @@ -59,7 +59,7 @@ </android.support.design.widget.AppBarLayout> - <android.support.v4.widget.NestedScrollView + <androidx.core.widget.NestedScrollView android:layout_width="match_parent" android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior"> @@ -76,7 +76,7 @@ </LinearLayout> - </android.support.v4.widget.NestedScrollView> + </androidx.core.widget.NestedScrollView> <android.support.design.widget.FloatingActionButton android:id="@+id/start_button" @@ -88,4 +88,4 @@ android:layout_margin="@dimen/fab_margin" android:clickable="true"/> -</android.support.design.widget.CoordinatorLayout> +</androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/tests/UiBench/Android.mk b/tests/UiBench/Android.mk index c8e6c2091d8f..6ec0fbbb5ed9 100644 --- a/tests/UiBench/Android.mk +++ b/tests/UiBench/Android.mk @@ -15,12 +15,12 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_USE_AAPT2 := true LOCAL_STATIC_ANDROID_LIBRARIES := \ - $(ANDROID_SUPPORT_DESIGN_TARGETS) \ - android-support-v4 \ - android-support-v7-appcompat \ - android-support-v7-cardview \ - android-support-v7-recyclerview \ - android-support-v17-leanback + androidx.design_design \ + androidx.legacy_legacy-support-v4 \ + androidx.appcompat_appcompat \ + androidx.cardview_cardview \ + androidx.recyclerview_recyclerview \ + androidx.leanback_leanback LOCAL_PACKAGE_NAME := UiBench diff --git a/tests/UiBench/res/layout/activity_bitmap_upload.xml b/tests/UiBench/res/layout/activity_bitmap_upload.xml index 70faa07a6d75..9a8293437c21 100644 --- a/tests/UiBench/res/layout/activity_bitmap_upload.xml +++ b/tests/UiBench/res/layout/activity_bitmap_upload.xml @@ -22,7 +22,7 @@ android:layout_height="match_parent" android:padding="10dp" android:clipToPadding="false"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1"> @@ -30,22 +30,22 @@ android:id="@+id/upload_view" android:layout_width="match_parent" android:layout_height="match_parent"/> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> - <android.support.v4.widget.Space + <androidx.legacy.widget.Space android:layout_height="10dp" android:layout_width="match_parent" /> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" /> - <android.support.v4.widget.Space + <androidx.legacy.widget.Space android:layout_height="10dp" android:layout_width="match_parent" /> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" /> diff --git a/tests/UiBench/res/layout/activity_navigation_drawer.xml b/tests/UiBench/res/layout/activity_navigation_drawer.xml index 8d4bfafd8dd8..282fb7870526 100644 --- a/tests/UiBench/res/layout/activity_navigation_drawer.xml +++ b/tests/UiBench/res/layout/activity_navigation_drawer.xml @@ -14,7 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<android.support.v4.widget.DrawerLayout +<androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" @@ -36,4 +36,4 @@ app:headerLayout="@layout/nav_header_navigation_drawer" app:menu="@menu/activity_navigation_drawer_drawer"/> -</android.support.v4.widget.DrawerLayout> +</androidx.drawerlayout.widget.DrawerLayout> diff --git a/tests/UiBench/res/layout/app_bar_navigation_drawer.xml b/tests/UiBench/res/layout/app_bar_navigation_drawer.xml index 5657587f7772..b9791341a40b 100644 --- a/tests/UiBench/res/layout/app_bar_navigation_drawer.xml +++ b/tests/UiBench/res/layout/app_bar_navigation_drawer.xml @@ -14,7 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<android.support.design.widget.CoordinatorLayout +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/app_bar_layout" android:layout_width="match_parent" @@ -26,11 +26,11 @@ android:layout_height="wrap_content" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:background="?attr/colorPrimary"/> </android.support.design.widget.AppBarLayout> -</android.support.design.widget.CoordinatorLayout> +</androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/tests/UiBench/res/layout/card_row.xml b/tests/UiBench/res/layout/card_row.xml index 215f9df9b7fd..9ebff8e2d6ca 100644 --- a/tests/UiBench/res/layout/card_row.xml +++ b/tests/UiBench/res/layout/card_row.xml @@ -24,7 +24,7 @@ android:paddingBottom="5dp" android:clipToPadding="false" android:background="@null"> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1"> @@ -32,13 +32,13 @@ android:id="@+id/card_text" android:layout_width="match_parent" android:layout_height="match_parent"/> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> - <android.support.v4.widget.Space + <androidx.legacy.widget.Space android:layout_height="match_parent" android:layout_width="10dp" /> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" /> diff --git a/tests/UiBench/res/layout/recycler_view.xml b/tests/UiBench/res/layout/recycler_view.xml index 54c5b5845ae2..53eab68f7866 100644 --- a/tests/UiBench/res/layout/recycler_view.xml +++ b/tests/UiBench/res/layout/recycler_view.xml @@ -14,7 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<android.support.v7.widget.RecyclerView +<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/recyclerView" android:layout_width="match_parent" diff --git a/tests/UiBench/src/com/android/test/uibench/ActivityTransition.java b/tests/UiBench/src/com/android/test/uibench/ActivityTransition.java index c212c4cbf61a..50f145a1b171 100644 --- a/tests/UiBench/src/com/android/test/uibench/ActivityTransition.java +++ b/tests/UiBench/src/com/android/test/uibench/ActivityTransition.java @@ -22,7 +22,7 @@ import android.content.res.Configuration; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.GridLayout; import android.widget.ImageView; diff --git a/tests/UiBench/src/com/android/test/uibench/ActivityTransitionDetails.java b/tests/UiBench/src/com/android/test/uibench/ActivityTransitionDetails.java index a4d57e173bfa..0f73765e87e7 100644 --- a/tests/UiBench/src/com/android/test/uibench/ActivityTransitionDetails.java +++ b/tests/UiBench/src/com/android/test/uibench/ActivityTransitionDetails.java @@ -21,7 +21,7 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.ImageView; diff --git a/tests/UiBench/src/com/android/test/uibench/BitmapUploadActivity.java b/tests/UiBench/src/com/android/test/uibench/BitmapUploadActivity.java index 235e0e61b353..09236ffebdf4 100644 --- a/tests/UiBench/src/com/android/test/uibench/BitmapUploadActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/BitmapUploadActivity.java @@ -23,7 +23,7 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Rect; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.view.View; diff --git a/tests/UiBench/src/com/android/test/uibench/ClippedListActivity.java b/tests/UiBench/src/com/android/test/uibench/ClippedListActivity.java index fee7480fa65e..6e24ce1de3aa 100644 --- a/tests/UiBench/src/com/android/test/uibench/ClippedListActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/ClippedListActivity.java @@ -17,13 +17,13 @@ package com.android.test.uibench; import android.os.Bundle; import android.support.design.widget.NavigationView; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.ListFragment; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.ListFragment; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.widget.ArrayAdapter; import android.widget.ListAdapter; diff --git a/tests/UiBench/src/com/android/test/uibench/DialogListActivity.java b/tests/UiBench/src/com/android/test/uibench/DialogListActivity.java index fe712d5230bb..c87b49b9f66f 100644 --- a/tests/UiBench/src/com/android/test/uibench/DialogListActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/DialogListActivity.java @@ -16,8 +16,8 @@ package com.android.test.uibench; import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import android.widget.ArrayAdapter; import android.widget.ListView; diff --git a/tests/UiBench/src/com/android/test/uibench/EditTextTypeActivity.java b/tests/UiBench/src/com/android/test/uibench/EditTextTypeActivity.java index 08ab5105a5e8..1b2c3c60ffd4 100644 --- a/tests/UiBench/src/com/android/test/uibench/EditTextTypeActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/EditTextTypeActivity.java @@ -19,7 +19,7 @@ import android.app.Instrumentation; import android.os.Bundle; import android.os.Looper; import android.os.MessageQueue; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.KeyEvent; import android.widget.EditText; diff --git a/tests/UiBench/src/com/android/test/uibench/FadingEdgeListActivity.java b/tests/UiBench/src/com/android/test/uibench/FadingEdgeListActivity.java index 3241e669fb1d..f8e9f03ee599 100644 --- a/tests/UiBench/src/com/android/test/uibench/FadingEdgeListActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/FadingEdgeListActivity.java @@ -15,7 +15,7 @@ */ package com.android.test.uibench; -import android.support.v4.app.ListFragment; +import androidx.fragment.app.ListFragment; import android.widget.ArrayAdapter; import android.widget.ListAdapter; diff --git a/tests/UiBench/src/com/android/test/uibench/FullscreenOverdrawActivity.java b/tests/UiBench/src/com/android/test/uibench/FullscreenOverdrawActivity.java index b9c5fac96a3e..882163bd6b0e 100644 --- a/tests/UiBench/src/com/android/test/uibench/FullscreenOverdrawActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/FullscreenOverdrawActivity.java @@ -25,7 +25,7 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; /** diff --git a/tests/UiBench/src/com/android/test/uibench/GlTextureViewActivity.java b/tests/UiBench/src/com/android/test/uibench/GlTextureViewActivity.java index 36d703c8e1a2..b26a660981da 100644 --- a/tests/UiBench/src/com/android/test/uibench/GlTextureViewActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/GlTextureViewActivity.java @@ -20,7 +20,7 @@ import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.graphics.SurfaceTexture; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.util.DisplayMetrics; import android.util.Log; import android.view.Gravity; diff --git a/tests/UiBench/src/com/android/test/uibench/InvalidateActivity.java b/tests/UiBench/src/com/android/test/uibench/InvalidateActivity.java index 81d03ffee0ed..76ed1ae4e445 100644 --- a/tests/UiBench/src/com/android/test/uibench/InvalidateActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/InvalidateActivity.java @@ -21,8 +21,8 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; import android.os.Bundle; -import android.support.annotation.ColorInt; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.ColorInt; +import androidx.appcompat.app.AppCompatActivity; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; diff --git a/tests/UiBench/src/com/android/test/uibench/InvalidateTreeActivity.java b/tests/UiBench/src/com/android/test/uibench/InvalidateTreeActivity.java index b800c26bfc60..804ced14d522 100644 --- a/tests/UiBench/src/com/android/test/uibench/InvalidateTreeActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/InvalidateTreeActivity.java @@ -19,7 +19,7 @@ import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.graphics.Color; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.view.ViewGroup; import android.widget.LinearLayout; diff --git a/tests/UiBench/src/com/android/test/uibench/MainActivity.java b/tests/UiBench/src/com/android/test/uibench/MainActivity.java index 79837b6ea250..0a7aa4281b00 100644 --- a/tests/UiBench/src/com/android/test/uibench/MainActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/MainActivity.java @@ -19,9 +19,9 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.ListFragment; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.ListFragment; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.ListView; import android.widget.SimpleAdapter; diff --git a/tests/UiBench/src/com/android/test/uibench/NavigationDrawerActivity.java b/tests/UiBench/src/com/android/test/uibench/NavigationDrawerActivity.java index a54110454f7a..6a7761ceaae0 100644 --- a/tests/UiBench/src/com/android/test/uibench/NavigationDrawerActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/NavigationDrawerActivity.java @@ -17,11 +17,11 @@ package com.android.test.uibench; import android.os.Bundle; import android.support.design.widget.NavigationView; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; public class NavigationDrawerActivity extends AppCompatActivity diff --git a/tests/UiBench/src/com/android/test/uibench/NotificationShadeActivity.java b/tests/UiBench/src/com/android/test/uibench/NotificationShadeActivity.java index 70deeead6cf1..1ab90fe97c87 100644 --- a/tests/UiBench/src/com/android/test/uibench/NotificationShadeActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/NotificationShadeActivity.java @@ -18,8 +18,8 @@ package com.android.test.uibench; import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import android.view.GestureDetector; import android.view.LayoutInflater; import android.view.MotionEvent; diff --git a/tests/UiBench/src/com/android/test/uibench/ResizeHWLayerActivity.java b/tests/UiBench/src/com/android/test/uibench/ResizeHWLayerActivity.java index 23a2713abd40..80d495df142c 100644 --- a/tests/UiBench/src/com/android/test/uibench/ResizeHWLayerActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/ResizeHWLayerActivity.java @@ -19,7 +19,7 @@ import android.animation.PropertyValuesHolder; import android.animation.ValueAnimator; import android.graphics.Color; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.util.DisplayMetrics; import android.view.View; import android.view.ViewGroup.LayoutParams; diff --git a/tests/UiBench/src/com/android/test/uibench/SaveLayerInterleaveActivity.java b/tests/UiBench/src/com/android/test/uibench/SaveLayerInterleaveActivity.java index eec91cb38066..332240d7639b 100644 --- a/tests/UiBench/src/com/android/test/uibench/SaveLayerInterleaveActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/SaveLayerInterleaveActivity.java @@ -23,7 +23,7 @@ import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; /** * Test Canvas.saveLayer performance by interleaving drawText/drawRect with saveLayer. diff --git a/tests/UiBench/src/com/android/test/uibench/ScrollableWebViewActivity.java b/tests/UiBench/src/com/android/test/uibench/ScrollableWebViewActivity.java index 02c2a0898cdd..e754c3ab5726 100644 --- a/tests/UiBench/src/com/android/test/uibench/ScrollableWebViewActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/ScrollableWebViewActivity.java @@ -16,7 +16,7 @@ package com.android.test.uibench; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.webkit.WebView; public class ScrollableWebViewActivity extends AppCompatActivity { diff --git a/tests/UiBench/src/com/android/test/uibench/ShadowGridActivity.java b/tests/UiBench/src/com/android/test/uibench/ShadowGridActivity.java index 88847eed17fa..af7c65acafd4 100644 --- a/tests/UiBench/src/com/android/test/uibench/ShadowGridActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/ShadowGridActivity.java @@ -16,9 +16,9 @@ package com.android.test.uibench; import android.os.Bundle; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.ListFragment; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.ListFragment; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.ArrayAdapter; diff --git a/tests/UiBench/src/com/android/test/uibench/SlowBindRecyclerViewActivity.java b/tests/UiBench/src/com/android/test/uibench/SlowBindRecyclerViewActivity.java index e32862f7b7fd..14e59ae46917 100644 --- a/tests/UiBench/src/com/android/test/uibench/SlowBindRecyclerViewActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/SlowBindRecyclerViewActivity.java @@ -17,8 +17,8 @@ package com.android.test.uibench; import android.content.Context; import android.os.Trace; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.android.test.uibench.recyclerview.RvBoxAdapter; import com.android.test.uibench.recyclerview.RvCompatListActivity; diff --git a/tests/UiBench/src/com/android/test/uibench/SlowNestedRecyclerViewActivity.java b/tests/UiBench/src/com/android/test/uibench/SlowNestedRecyclerViewActivity.java index 305c05104f95..8fdd4b90c23e 100644 --- a/tests/UiBench/src/com/android/test/uibench/SlowNestedRecyclerViewActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/SlowNestedRecyclerViewActivity.java @@ -20,8 +20,8 @@ import android.content.res.Resources; import android.graphics.Color; import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.InsetDrawable; -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.View; import android.view.ViewGroup; diff --git a/tests/UiBench/src/com/android/test/uibench/TrivialAnimationActivity.java b/tests/UiBench/src/com/android/test/uibench/TrivialAnimationActivity.java index 6e984727836e..3ee132efbf50 100644 --- a/tests/UiBench/src/com/android/test/uibench/TrivialAnimationActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/TrivialAnimationActivity.java @@ -19,7 +19,7 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; public class TrivialAnimationActivity extends AppCompatActivity { @Override diff --git a/tests/UiBench/src/com/android/test/uibench/TrivialRecyclerViewActivity.java b/tests/UiBench/src/com/android/test/uibench/TrivialRecyclerViewActivity.java index 4647ba774b2e..b30055810465 100644 --- a/tests/UiBench/src/com/android/test/uibench/TrivialRecyclerViewActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/TrivialRecyclerViewActivity.java @@ -15,7 +15,7 @@ */ package com.android.test.uibench; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import com.android.test.uibench.recyclerview.RvArrayAdapter; import com.android.test.uibench.recyclerview.RvCompatListActivity; diff --git a/tests/UiBench/src/com/android/test/uibench/leanback/BitmapLoader.java b/tests/UiBench/src/com/android/test/uibench/leanback/BitmapLoader.java index 8af9d3bca647..ca379daedc1d 100644 --- a/tests/UiBench/src/com/android/test/uibench/leanback/BitmapLoader.java +++ b/tests/UiBench/src/com/android/test/uibench/leanback/BitmapLoader.java @@ -21,7 +21,7 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; import android.os.AsyncTask; -import android.support.v4.util.LruCache; +import androidx.collection.LruCache; import android.util.DisplayMetrics; import android.widget.ImageView; diff --git a/tests/UiBench/src/com/android/test/uibench/leanback/BrowseActivity.java b/tests/UiBench/src/com/android/test/uibench/leanback/BrowseActivity.java index d29f0eaf6fdc..804a2f3b9dc8 100644 --- a/tests/UiBench/src/com/android/test/uibench/leanback/BrowseActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/leanback/BrowseActivity.java @@ -13,7 +13,7 @@ */ package com.android.test.uibench.leanback; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import android.app.Activity; import android.os.Bundle; diff --git a/tests/UiBench/src/com/android/test/uibench/leanback/BrowseFragment.java b/tests/UiBench/src/com/android/test/uibench/leanback/BrowseFragment.java index 4ab38a66d504..b1cd89d4997d 100644 --- a/tests/UiBench/src/com/android/test/uibench/leanback/BrowseFragment.java +++ b/tests/UiBench/src/com/android/test/uibench/leanback/BrowseFragment.java @@ -17,7 +17,7 @@ package com.android.test.uibench.leanback; import android.os.Bundle; -public class BrowseFragment extends android.support.v17.leanback.app.BrowseSupportFragment { +public class BrowseFragment extends androidx.leanback.app.BrowseSupportFragment { public BrowseFragment() { } diff --git a/tests/UiBench/src/com/android/test/uibench/leanback/CardPresenter.java b/tests/UiBench/src/com/android/test/uibench/leanback/CardPresenter.java index 5194555aca01..ba7180050223 100644 --- a/tests/UiBench/src/com/android/test/uibench/leanback/CardPresenter.java +++ b/tests/UiBench/src/com/android/test/uibench/leanback/CardPresenter.java @@ -17,9 +17,9 @@ package com.android.test.uibench.leanback; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.v17.leanback.widget.ImageCardView; -import android.support.v17.leanback.widget.Presenter; -import android.support.v4.content.res.ResourcesCompat; +import androidx.leanback.widget.ImageCardView; +import androidx.leanback.widget.Presenter; +import androidx.core.content.res.ResourcesCompat; import android.view.ContextThemeWrapper; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; diff --git a/tests/UiBench/src/com/android/test/uibench/leanback/TestHelper.java b/tests/UiBench/src/com/android/test/uibench/leanback/TestHelper.java index bf408f7475ac..bcb47327850a 100644 --- a/tests/UiBench/src/com/android/test/uibench/leanback/TestHelper.java +++ b/tests/UiBench/src/com/android/test/uibench/leanback/TestHelper.java @@ -19,13 +19,13 @@ import android.app.Activity; import android.content.Context; import android.graphics.Bitmap; import android.graphics.Canvas; -import android.support.v17.leanback.app.BackgroundManager; -import android.support.v17.leanback.widget.ArrayObjectAdapter; -import android.support.v17.leanback.widget.HeaderItem; -import android.support.v17.leanback.widget.ListRow; -import android.support.v17.leanback.widget.ListRowPresenter; -import android.support.v17.leanback.widget.ObjectAdapter; -import android.support.v17.leanback.widget.Presenter; +import androidx.leanback.app.BackgroundManager; +import androidx.leanback.widget.ArrayObjectAdapter; +import androidx.leanback.widget.HeaderItem; +import androidx.leanback.widget.ListRow; +import androidx.leanback.widget.ListRowPresenter; +import androidx.leanback.widget.ObjectAdapter; +import androidx.leanback.widget.Presenter; import android.util.DisplayMetrics; import android.util.TypedValue; diff --git a/tests/UiBench/src/com/android/test/uibench/listview/CompatListActivity.java b/tests/UiBench/src/com/android/test/uibench/listview/CompatListActivity.java index bb7f4a302f8c..66595585c525 100644 --- a/tests/UiBench/src/com/android/test/uibench/listview/CompatListActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/listview/CompatListActivity.java @@ -16,9 +16,9 @@ package com.android.test.uibench.listview; import android.os.Bundle; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.ListFragment; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.ListFragment; +import androidx.appcompat.app.AppCompatActivity; import android.widget.ListAdapter; public abstract class CompatListActivity extends AppCompatActivity { diff --git a/tests/UiBench/src/com/android/test/uibench/listview/FadingEdgeListFragment.java b/tests/UiBench/src/com/android/test/uibench/listview/FadingEdgeListFragment.java index a018b40e8528..538066ef7abf 100644 --- a/tests/UiBench/src/com/android/test/uibench/listview/FadingEdgeListFragment.java +++ b/tests/UiBench/src/com/android/test/uibench/listview/FadingEdgeListFragment.java @@ -16,7 +16,7 @@ package com.android.test.uibench.listview; import android.os.Bundle; -import android.support.v4.app.ListFragment; +import androidx.fragment.app.ListFragment; import android.widget.ListView; public class FadingEdgeListFragment extends ListFragment { diff --git a/tests/UiBench/src/com/android/test/uibench/recyclerview/RvArrayAdapter.java b/tests/UiBench/src/com/android/test/uibench/recyclerview/RvArrayAdapter.java index e5a3a49cf228..7a355c8acfd3 100644 --- a/tests/UiBench/src/com/android/test/uibench/recyclerview/RvArrayAdapter.java +++ b/tests/UiBench/src/com/android/test/uibench/recyclerview/RvArrayAdapter.java @@ -15,7 +15,7 @@ */ package com.android.test.uibench.recyclerview; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/tests/UiBench/src/com/android/test/uibench/recyclerview/RvBoxAdapter.java b/tests/UiBench/src/com/android/test/uibench/recyclerview/RvBoxAdapter.java index 3440f192e7c5..abb1160b6b1a 100644 --- a/tests/UiBench/src/com/android/test/uibench/recyclerview/RvBoxAdapter.java +++ b/tests/UiBench/src/com/android/test/uibench/recyclerview/RvBoxAdapter.java @@ -17,7 +17,7 @@ package com.android.test.uibench.recyclerview; import android.content.Context; import android.graphics.Color; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.TypedValue; import android.view.ViewGroup; import android.widget.TextView; diff --git a/tests/UiBench/src/com/android/test/uibench/recyclerview/RvCompatListActivity.java b/tests/UiBench/src/com/android/test/uibench/recyclerview/RvCompatListActivity.java index 939b66198d72..bd313ad7636d 100644 --- a/tests/UiBench/src/com/android/test/uibench/recyclerview/RvCompatListActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/recyclerview/RvCompatListActivity.java @@ -17,12 +17,12 @@ package com.android.test.uibench.recyclerview; import android.content.Context; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/tests/UsageStatsTest/Android.mk b/tests/UsageStatsTest/Android.mk index 6735c7c8f787..5eed38c86657 100644 --- a/tests/UsageStatsTest/Android.mk +++ b/tests/UsageStatsTest/Android.mk @@ -6,7 +6,8 @@ LOCAL_MODULE_TAGS := tests # Only compile source java files in this apk. LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 +LOCAL_USE_AAPT2 := true +LOCAL_STATIC_ANDROID_LIBRARIES := androidx.legacy_legacy-support-v4 LOCAL_CERTIFICATE := platform diff --git a/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageLogActivity.java b/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageLogActivity.java index 05cac10f92c6..3480e96b3547 100644 --- a/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageLogActivity.java +++ b/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageLogActivity.java @@ -21,7 +21,7 @@ import android.app.usage.UsageStatsManager; import android.content.Context; import android.os.Bundle; import android.os.Handler; -import android.support.v4.util.CircularArray; +import androidx.collection.CircularArray; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; |