diff --git a/tests/Android.mk b/tests/Android.mk index 03cb154a40..8e1f2930df 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -18,8 +18,8 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ - ub-uiautomator \ + androidx-test \ + androidx.test.uiautomator_uiautomator \ mockito-target-minus-junit4 \ ub-launcher-aosp-tapl @@ -41,8 +41,8 @@ include $(BUILD_PACKAGE) include $(CLEAR_VARS) LOCAL_STATIC_JAVA_LIBRARIES := \ androidx.annotation_annotation \ - android-support-test \ - ub-uiautomator \ + androidx-test \ + androidx.test.uiautomator_uiautomator \ libSharedSystemUI LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \ diff --git a/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java b/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java index 846a163700..ab2adaaefa 100644 --- a/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java +++ b/tests/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithmTest.java @@ -16,7 +16,7 @@ package com.android.launcher3.allapps.search; import android.content.ComponentName; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.AppInfo; import com.android.launcher3.Utilities; diff --git a/tests/src/com/android/launcher3/logging/FileLogTest.java b/tests/src/com/android/launcher3/logging/FileLogTest.java index 9c7cb8f61c..e031f1d34a 100644 --- a/tests/src/com/android/launcher3/logging/FileLogTest.java +++ b/tests/src/com/android/launcher3/logging/FileLogTest.java @@ -1,8 +1,8 @@ package com.android.launcher3.logging; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.After; import org.junit.Before; diff --git a/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java b/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java index 401711d072..dae8f2f9ab 100644 --- a/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java +++ b/tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java @@ -7,7 +7,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.Rect; import android.net.Uri; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; import android.util.Pair; import com.android.launcher3.ItemInfo; diff --git a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java index 5d5af4f24f..dd3e859fda 100644 --- a/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java +++ b/tests/src/com/android/launcher3/model/BaseModelUpdateTaskTestCase.java @@ -18,8 +18,8 @@ import android.graphics.Bitmap.Config; import android.graphics.Color; import android.os.Process; import android.os.UserHandle; -import android.support.test.InstrumentationRegistry; -import android.support.test.rule.provider.ProviderTestRule; +import androidx.test.InstrumentationRegistry; +import androidx.test.rule.provider.ProviderTestRule; import com.android.launcher3.AllAppsList; import com.android.launcher3.AppFilter; diff --git a/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java b/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java index ac9d319c83..59f807acf2 100644 --- a/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java +++ b/tests/src/com/android/launcher3/model/CacheDataUpdatedTaskTest.java @@ -1,6 +1,6 @@ package com.android.launcher3.model; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.AppInfo; import com.android.launcher3.ItemInfo; diff --git a/tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java b/tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java index 1d9148ba13..0903ddc16d 100644 --- a/tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java +++ b/tests/src/com/android/launcher3/model/DbDowngradeHelperTest.java @@ -25,9 +25,9 @@ import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.LauncherProvider; import com.android.launcher3.LauncherProvider.DatabaseHelper; diff --git a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java index 031909fe12..b2fd1d9687 100644 --- a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java +++ b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java @@ -7,10 +7,10 @@ import android.content.ContextWrapper; import android.content.Intent; import android.database.Cursor; import android.graphics.Point; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; -import android.support.test.rule.provider.ProviderTestRule; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; +import androidx.test.rule.provider.ProviderTestRule; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherModel; diff --git a/tests/src/com/android/launcher3/model/LoaderCursorTest.java b/tests/src/com/android/launcher3/model/LoaderCursorTest.java index dfefa3140a..29e54b1374 100644 --- a/tests/src/com/android/launcher3/model/LoaderCursorTest.java +++ b/tests/src/com/android/launcher3/model/LoaderCursorTest.java @@ -6,9 +6,9 @@ import android.content.Intent; import android.database.MatrixCursor; import android.graphics.Bitmap; import android.os.Process; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.IconCache; import com.android.launcher3.InvariantDeviceProfile; diff --git a/tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java b/tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java index 0a741c4792..51e21e2c76 100644 --- a/tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java +++ b/tests/src/com/android/launcher3/model/PackageInstallStateChangedTaskTest.java @@ -1,6 +1,6 @@ package com.android.launcher3.model; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.ItemInfo; import com.android.launcher3.LauncherAppWidgetInfo; diff --git a/tests/src/com/android/launcher3/popup/PopupPopulatorTest.java b/tests/src/com/android/launcher3/popup/PopupPopulatorTest.java index 9a89b1b2f2..6a1dc96671 100644 --- a/tests/src/com/android/launcher3/popup/PopupPopulatorTest.java +++ b/tests/src/com/android/launcher3/popup/PopupPopulatorTest.java @@ -17,7 +17,7 @@ package com.android.launcher3.popup; import android.content.pm.ShortcutInfo; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.shortcuts.ShortcutInfoCompat; diff --git a/tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java b/tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java index 5d417b5bcf..babb7315eb 100644 --- a/tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java +++ b/tests/src/com/android/launcher3/provider/RestoreDbTaskTest.java @@ -3,9 +3,9 @@ package com.android.launcher3.provider; import android.content.ContentValues; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.LauncherProvider.DatabaseHelper; import com.android.launcher3.LauncherSettings.Favorites; diff --git a/tests/src/com/android/launcher3/touch/SwipeDetectorTest.java b/tests/src/com/android/launcher3/touch/SwipeDetectorTest.java index ff83131d10..73b6dafd1e 100644 --- a/tests/src/com/android/launcher3/touch/SwipeDetectorTest.java +++ b/tests/src/com/android/launcher3/touch/SwipeDetectorTest.java @@ -15,9 +15,9 @@ */ package com.android.launcher3.touch; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import android.util.Log; import android.view.MotionEvent; import android.view.ViewConfiguration; diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 46a6446f24..7e8890ad2a 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -29,13 +29,13 @@ import android.graphics.Point; import android.os.Process; import android.os.RemoteException; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.BySelector; -import android.support.test.uiautomator.Direction; -import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; +import androidx.test.InstrumentationRegistry; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.BySelector; +import androidx.test.uiautomator.Direction; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import android.util.Log; import android.view.MotionEvent; diff --git a/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java b/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java index 8b9c58400f..23560e881a 100644 --- a/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java +++ b/tests/src/com/android/launcher3/ui/AllAppsIconToHomeTest.java @@ -3,11 +3,11 @@ package com.android.launcher3.ui; import static org.junit.Assert.assertTrue; import android.content.pm.LauncherActivityInfo; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import com.android.launcher3.util.Condition; import com.android.launcher3.util.Wait; diff --git a/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java b/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java index f913470370..f8a7bf79e4 100644 --- a/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java +++ b/tests/src/com/android/launcher3/ui/ShortcutsLaunchTest.java @@ -5,11 +5,11 @@ import static org.junit.Assert.assertTrue; import android.content.pm.LauncherActivityInfo; import android.graphics.Point; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import android.view.MotionEvent; import com.android.launcher3.R; diff --git a/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java b/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java index 4f5c1137b3..ff1dcf3d6c 100644 --- a/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java +++ b/tests/src/com/android/launcher3/ui/ShortcutsToHomeTest.java @@ -5,11 +5,11 @@ import static org.junit.Assert.assertTrue; import android.content.pm.LauncherActivityInfo; import android.graphics.Point; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import android.view.MotionEvent; import com.android.launcher3.R; diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java index 2f867f366a..044b7f3382 100644 --- a/tests/src/com/android/launcher3/ui/WorkTabTest.java +++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java @@ -19,8 +19,8 @@ import static com.android.launcher3.LauncherState.ALL_APPS; import static org.junit.Assert.assertTrue; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; import com.android.launcher3.util.rule.ShellCommandRule; diff --git a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java index 7f6dd44d1d..183e3908ee 100644 --- a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java @@ -22,10 +22,10 @@ import static org.junit.Assert.assertTrue; import android.appwidget.AppWidgetManager; import android.content.Intent; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.UiObject2; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiObject2; import android.view.View; import com.android.launcher3.ItemInfo; diff --git a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java index d89f26e8a2..050f046d00 100644 --- a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java @@ -17,10 +17,10 @@ package com.android.launcher3.ui.widget; import static org.junit.Assert.assertTrue; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.UiObject2; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiObject2; import android.view.View; import com.android.launcher3.ItemInfo; diff --git a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java index c8c38965c1..0dc9b2e675 100644 --- a/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/BindWidgetTest.java @@ -30,9 +30,9 @@ import android.content.pm.PackageInstaller.SessionParams; import android.content.pm.PackageManager; import android.database.Cursor; import android.os.Bundle; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; -import android.support.test.uiautomator.UiSelector; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.UiSelector; import com.android.launcher3.LauncherAppWidgetHost; import com.android.launcher3.LauncherAppWidgetInfo; diff --git a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java index ec0a0513ba..74f0978b44 100644 --- a/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java +++ b/tests/src/com/android/launcher3/ui/widget/RequestPinItemTest.java @@ -23,11 +23,11 @@ import android.app.PendingIntent; import android.appwidget.AppWidgetManager; import android.content.Intent; import android.graphics.Color; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; +import androidx.test.filters.LargeTest; +import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import android.view.View; import com.android.launcher3.ItemInfo; diff --git a/tests/src/com/android/launcher3/util/Condition.java b/tests/src/com/android/launcher3/util/Condition.java index 78c652a29e..b564a1a873 100644 --- a/tests/src/com/android/launcher3/util/Condition.java +++ b/tests/src/com/android/launcher3/util/Condition.java @@ -1,6 +1,6 @@ package com.android.launcher3.util; -import android.support.test.uiautomator.UiObject2; +import androidx.test.uiautomator.UiObject2; import com.android.launcher3.MainThreadExecutor; diff --git a/tests/src/com/android/launcher3/util/GridOccupancyTest.java b/tests/src/com/android/launcher3/util/GridOccupancyTest.java index fdd8e88863..cbf30b1788 100644 --- a/tests/src/com/android/launcher3/util/GridOccupancyTest.java +++ b/tests/src/com/android/launcher3/util/GridOccupancyTest.java @@ -1,7 +1,7 @@ package com.android.launcher3.util; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/src/com/android/launcher3/util/rule/LauncherActivityRule.java b/tests/src/com/android/launcher3/util/rule/LauncherActivityRule.java index edd152a2c7..1c7160fe51 100644 --- a/tests/src/com/android/launcher3/util/rule/LauncherActivityRule.java +++ b/tests/src/com/android/launcher3/util/rule/LauncherActivityRule.java @@ -20,7 +20,7 @@ import android.app.Application; import android.app.Application.ActivityLifecycleCallbacks; import android.content.Intent; import android.os.Bundle; -import android.support.test.InstrumentationRegistry; +import androidx.test.InstrumentationRegistry; import com.android.launcher3.Launcher; import com.android.launcher3.Workspace.ItemOperator; diff --git a/tests/src/com/android/launcher3/util/rule/ShellCommandRule.java b/tests/src/com/android/launcher3/util/rule/ShellCommandRule.java index dba2d71003..9f0db2bf9e 100644 --- a/tests/src/com/android/launcher3/util/rule/ShellCommandRule.java +++ b/tests/src/com/android/launcher3/util/rule/ShellCommandRule.java @@ -18,7 +18,7 @@ package com.android.launcher3.util.rule; import android.content.ComponentName; import android.content.pm.ActivityInfo; import android.os.ParcelFileDescriptor; -import android.support.test.InstrumentationRegistry; +import androidx.test.InstrumentationRegistry; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java b/tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java index 5befeb9abe..d5b14f2985 100644 --- a/tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java +++ b/tests/src/com/android/launcher3/widget/WidgetsListAdapterTest.java @@ -24,9 +24,9 @@ import android.appwidget.AppWidgetProviderInfo; import android.content.Context; import android.content.pm.PackageManager; import android.graphics.Bitmap; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import android.view.LayoutInflater; import com.android.launcher3.IconCache; diff --git a/tests/tapl/com/android/launcher3/tapl/AllApps.java b/tests/tapl/com/android/launcher3/tapl/AllApps.java index c3bc61babf..c1eba202cf 100644 --- a/tests/tapl/com/android/launcher3/tapl/AllApps.java +++ b/tests/tapl/com/android/launcher3/tapl/AllApps.java @@ -18,9 +18,9 @@ package com.android.launcher3.tapl; import static org.junit.Assert.assertTrue; -import android.support.test.uiautomator.BySelector; -import android.support.test.uiautomator.Direction; -import android.support.test.uiautomator.UiObject2; +import androidx.test.uiautomator.BySelector; +import androidx.test.uiautomator.Direction; +import androidx.test.uiautomator.UiObject2; import androidx.annotation.NonNull; diff --git a/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java b/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java index 07e73fc9be..dd286bd1f2 100644 --- a/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java +++ b/tests/tapl/com/android/launcher3/tapl/AllAppsFromOverview.java @@ -17,7 +17,7 @@ package com.android.launcher3.tapl; import android.graphics.Point; -import android.support.test.uiautomator.UiObject2; +import androidx.test.uiautomator.UiObject2; import androidx.annotation.NonNull; diff --git a/tests/tapl/com/android/launcher3/tapl/AppIcon.java b/tests/tapl/com/android/launcher3/tapl/AppIcon.java index 721f7a8ef8..a0f32a4569 100644 --- a/tests/tapl/com/android/launcher3/tapl/AppIcon.java +++ b/tests/tapl/com/android/launcher3/tapl/AppIcon.java @@ -18,10 +18,10 @@ package com.android.launcher3.tapl; import static org.junit.Assert.assertTrue; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.BySelector; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.BySelector; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import android.widget.TextView; /** diff --git a/tests/tapl/com/android/launcher3/tapl/Home.java b/tests/tapl/com/android/launcher3/tapl/Home.java index 786f260b8b..815a63e6f1 100644 --- a/tests/tapl/com/android/launcher3/tapl/Home.java +++ b/tests/tapl/com/android/launcher3/tapl/Home.java @@ -16,7 +16,7 @@ package com.android.launcher3.tapl; -import android.support.test.uiautomator.UiObject2; +import androidx.test.uiautomator.UiObject2; import androidx.annotation.NonNull; diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java index 01e76f3f30..bf8b537ece 100644 --- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java +++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java @@ -26,12 +26,12 @@ import android.app.ActivityManager; import android.app.UiAutomation; import android.os.Bundle; import android.provider.Settings; -import android.support.test.InstrumentationRegistry; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.BySelector; -import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; +import androidx.test.InstrumentationRegistry; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.BySelector; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import android.view.accessibility.AccessibilityEvent; import com.android.launcher3.TestProtocol; diff --git a/tests/tapl/com/android/launcher3/tapl/Overview.java b/tests/tapl/com/android/launcher3/tapl/Overview.java index 3c0ae2daf6..be1d219af2 100644 --- a/tests/tapl/com/android/launcher3/tapl/Overview.java +++ b/tests/tapl/com/android/launcher3/tapl/Overview.java @@ -19,8 +19,8 @@ package com.android.launcher3.tapl; import static org.junit.Assert.assertNotEquals; import android.graphics.Point; -import android.support.test.uiautomator.Direction; -import android.support.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Direction; +import androidx.test.uiautomator.UiObject2; import java.util.Collections; import java.util.List; diff --git a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java index 0b3a26492e..ecad768539 100644 --- a/tests/tapl/com/android/launcher3/tapl/OverviewTask.java +++ b/tests/tapl/com/android/launcher3/tapl/OverviewTask.java @@ -18,9 +18,9 @@ package com.android.launcher3.tapl; import static org.junit.Assert.assertTrue; -import android.support.test.uiautomator.Direction; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; +import androidx.test.uiautomator.Direction; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; /** * A recent task in the overview panel carousel. diff --git a/tests/tapl/com/android/launcher3/tapl/Widgets.java b/tests/tapl/com/android/launcher3/tapl/Widgets.java index f67ef4c774..facf1c6d73 100644 --- a/tests/tapl/com/android/launcher3/tapl/Widgets.java +++ b/tests/tapl/com/android/launcher3/tapl/Widgets.java @@ -16,8 +16,8 @@ package com.android.launcher3.tapl; -import android.support.test.uiautomator.Direction; -import android.support.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Direction; +import androidx.test.uiautomator.UiObject2; /** * All widgets container. diff --git a/tests/tapl/com/android/launcher3/tapl/Workspace.java b/tests/tapl/com/android/launcher3/tapl/Workspace.java index c58c24443a..f5b01ee9b2 100644 --- a/tests/tapl/com/android/launcher3/tapl/Workspace.java +++ b/tests/tapl/com/android/launcher3/tapl/Workspace.java @@ -19,8 +19,8 @@ package com.android.launcher3.tapl; import static junit.framework.TestCase.assertTrue; import android.graphics.Point; -import android.support.test.uiautomator.Direction; -import android.support.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Direction; +import androidx.test.uiautomator.UiObject2; import android.view.KeyEvent; import androidx.annotation.NonNull;