diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp index 8636c813282..d4f09a30178 100644 --- a/tests/uitests/Android.bp +++ b/tests/uitests/Android.bp @@ -35,6 +35,7 @@ android_test { static_libs: [ "androidx.test.rules", + "androidx.test.uiautomator_uiautomator", "app-helpers-core", "launcher-helper-lib", "metrics-helper-lib", @@ -43,7 +44,6 @@ android_test { "sysui-helper", "timeresult-helper-lib", "truth-prebuilt", - "ub-uiautomator", ], //sdk_version: "current", diff --git a/tests/uitests/src/com/android/settings/ui/AboutPhoneSettingsTests.java b/tests/uitests/src/com/android/settings/ui/AboutPhoneSettingsTests.java index a73a5a8cbfc..225b41558f6 100644 --- a/tests/uitests/src/com/android/settings/ui/AboutPhoneSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/AboutPhoneSettingsTests.java @@ -24,16 +24,16 @@ import android.app.Instrumentation; import android.content.Intent; import android.os.RemoteException; import android.provider.Settings; -import android.support.test.uiautomator.By; -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 android.text.TextUtils; import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.Direction; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import org.junit.After; import org.junit.Before; diff --git a/tests/uitests/src/com/android/settings/ui/AppsSettingsRetainFilterTests.java b/tests/uitests/src/com/android/settings/ui/AppsSettingsRetainFilterTests.java index 4698b9a4d84..b830b3037a2 100644 --- a/tests/uitests/src/com/android/settings/ui/AppsSettingsRetainFilterTests.java +++ b/tests/uitests/src/com/android/settings/ui/AppsSettingsRetainFilterTests.java @@ -21,14 +21,14 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Intent; import android.os.RemoteException; import android.provider.Settings; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; import android.system.helpers.ActivityHelper; import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import org.junit.Before; import org.junit.Test; diff --git a/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java b/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java index 81532b15b95..777ade64f2c 100644 --- a/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/AppsSettingsTests.java @@ -19,16 +19,17 @@ package com.android.settings.ui; import android.content.Intent; import android.os.RemoteException; import android.provider.Settings; -import android.support.test.uiautomator.By; -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 android.system.helpers.ActivityHelper; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.MediumTest; import android.util.Log; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.Direction; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; + /** Verifies basic functionality of the About Phone screen */ public class AppsSettingsTests extends InstrumentationTestCase { private static final boolean LOCAL_LOGV = false; diff --git a/tests/uitests/src/com/android/settings/ui/BatterySettingsUITest.java b/tests/uitests/src/com/android/settings/ui/BatterySettingsUITest.java index 3cf1e965cb7..e23239edd10 100644 --- a/tests/uitests/src/com/android/settings/ui/BatterySettingsUITest.java +++ b/tests/uitests/src/com/android/settings/ui/BatterySettingsUITest.java @@ -18,12 +18,12 @@ package com.android.settings.ui; import android.content.Intent; import android.os.RemoteException; -import android.support.test.uiautomator.UiDevice; import android.system.helpers.SettingsHelper; import androidx.test.InstrumentationRegistry; import androidx.test.filters.MediumTest; import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.UiDevice; import com.android.settings.ui.testutils.SettingsTestUtils; diff --git a/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.java b/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.java index ef0dacc3359..4fa985700fb 100644 --- a/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.java +++ b/tests/uitests/src/com/android/settings/ui/ConnectedDeviceTests.java @@ -24,14 +24,14 @@ import android.content.Intent; import android.nfc.NfcAdapter; import android.nfc.NfcManager; import android.os.RemoteException; -import android.support.test.uiautomator.By; -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.filters.MediumTest; import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import org.junit.After; import org.junit.Before; diff --git a/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java b/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java index eddc7717a06..b990f75bf05 100644 --- a/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/DataUsageSettingsTests.java @@ -18,13 +18,14 @@ package com.android.settings.ui; import android.os.RemoteException; import android.provider.Settings; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.Until; import android.system.helpers.SettingsHelper; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.MediumTest; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.Until; + public class DataUsageSettingsTests extends InstrumentationTestCase { private static final String SETTINGS_PACKAGE = "com.android.settings"; diff --git a/tests/uitests/src/com/android/settings/ui/HomepageDisplayTests.java b/tests/uitests/src/com/android/settings/ui/HomepageDisplayTests.java index 807ac6fa060..01cfbd4acc4 100644 --- a/tests/uitests/src/com/android/settings/ui/HomepageDisplayTests.java +++ b/tests/uitests/src/com/android/settings/ui/HomepageDisplayTests.java @@ -22,16 +22,16 @@ import static com.android.settings.ui.testutils.SettingsTestUtils.TIMEOUT; import android.os.RemoteException; import android.platform.test.annotations.Presubmit; import android.provider.Settings; -import android.support.test.uiautomator.By; -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 android.system.helpers.SettingsHelper; import androidx.test.InstrumentationRegistry; import androidx.test.filters.MediumTest; import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.Direction; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import com.android.settings.ui.testutils.SettingsTestUtils; diff --git a/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java b/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java index 8e391f31525..35b5742f43b 100644 --- a/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/LocationSettingsTests.java @@ -19,15 +19,16 @@ package com.android.settings.ui; import android.os.RemoteException; import android.platform.test.annotations.Presubmit; import android.provider.Settings; -import android.support.test.uiautomator.By; -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 android.system.helpers.SettingsHelper; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.MediumTest; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.Direction; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; + public class LocationSettingsTests extends InstrumentationTestCase { diff --git a/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTest2.java b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTest2.java index c18583b0b57..5ed2ca93d60 100644 --- a/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTest2.java +++ b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTest2.java @@ -20,13 +20,6 @@ import android.content.Context; import android.net.wifi.WifiManager; import android.os.RemoteException; import android.provider.Settings; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.BySelector; -import android.support.test.uiautomator.Direction; -import android.support.test.uiautomator.StaleObjectException; -import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; import android.system.helpers.CommandsHelper; import android.system.helpers.SettingsHelper; import android.test.InstrumentationTestCase; @@ -34,6 +27,14 @@ import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.Suppress; import android.util.Log; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.BySelector; +import androidx.test.uiautomator.Direction; +import androidx.test.uiautomator.StaleObjectException; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; + /** * Additional tests for Wifi Settings. */ diff --git a/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java index 25236869561..5bfc59df337 100644 --- a/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/MoreWirelessSettingsTests.java @@ -19,14 +19,15 @@ package com.android.settings.ui; import android.os.RemoteException; import android.platform.test.annotations.Presubmit; import android.provider.Settings; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; import android.system.helpers.SettingsHelper; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.MediumTest; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; + public class MoreWirelessSettingsTests extends InstrumentationTestCase { diff --git a/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java b/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java index e25005c28a0..6ab282852dd 100644 --- a/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/NotificationSettingsTests.java @@ -19,12 +19,6 @@ package com.android.settings.ui; import android.content.Intent; import android.os.RemoteException; import android.provider.Settings; -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 android.system.helpers.ActivityHelper; import android.system.helpers.SettingsHelper; import android.test.InstrumentationTestCase; @@ -32,6 +26,13 @@ import android.test.suitebuilder.annotation.MediumTest; import android.util.Log; import android.widget.ListView; +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; + /** Verifies that you can get to the notification app listing page from the apps & notifications * page */ public class NotificationSettingsTests extends InstrumentationTestCase { diff --git a/tests/uitests/src/com/android/settings/ui/SecuritySettingsLaunchTest.java b/tests/uitests/src/com/android/settings/ui/SecuritySettingsLaunchTest.java index 5efb7e88733..bae4c59589c 100644 --- a/tests/uitests/src/com/android/settings/ui/SecuritySettingsLaunchTest.java +++ b/tests/uitests/src/com/android/settings/ui/SecuritySettingsLaunchTest.java @@ -18,12 +18,12 @@ package com.android.settings.ui; import android.os.RemoteException; import android.provider.Settings; -import android.support.test.uiautomator.UiDevice; import android.system.helpers.SettingsHelper; import androidx.test.InstrumentationRegistry; import androidx.test.filters.MediumTest; import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.UiDevice; import com.android.settings.ui.testutils.SettingsTestUtils; diff --git a/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java b/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java index 0c2a33ff9fc..29f7eec8ff7 100644 --- a/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java +++ b/tests/uitests/src/com/android/settings/ui/SoundSettingsTest.java @@ -19,16 +19,17 @@ package com.android.settings.ui; import android.content.ContentResolver; import android.os.SystemClock; import android.provider.Settings; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; import android.system.helpers.SettingsHelper; import android.system.helpers.SettingsHelper.SettingsType; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.MediumTest; import android.test.suitebuilder.annotation.Suppress; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; + import java.util.Map; public class SoundSettingsTest extends InstrumentationTestCase { diff --git a/tests/uitests/src/com/android/settings/ui/StorageSettingsUITest.java b/tests/uitests/src/com/android/settings/ui/StorageSettingsUITest.java index b21da7118fa..63b87bae4ae 100644 --- a/tests/uitests/src/com/android/settings/ui/StorageSettingsUITest.java +++ b/tests/uitests/src/com/android/settings/ui/StorageSettingsUITest.java @@ -18,12 +18,12 @@ package com.android.settings.ui; import android.os.RemoteException; import android.provider.Settings; -import android.support.test.uiautomator.UiDevice; import android.system.helpers.SettingsHelper; import android.test.suitebuilder.annotation.MediumTest; import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.UiDevice; import com.android.settings.ui.testutils.SettingsTestUtils; diff --git a/tests/uitests/src/com/android/settings/ui/StorageWizardTest.java b/tests/uitests/src/com/android/settings/ui/StorageWizardTest.java index eefd1ebb74c..501515f1917 100644 --- a/tests/uitests/src/com/android/settings/ui/StorageWizardTest.java +++ b/tests/uitests/src/com/android/settings/ui/StorageWizardTest.java @@ -20,15 +20,15 @@ import android.content.Intent; import android.os.SystemClock; import android.os.storage.DiskInfo; import android.os.storage.VolumeInfo; -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.UiObjectNotFoundException; -import android.support.test.uiautomator.Until; import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.BySelector; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.UiObjectNotFoundException; +import androidx.test.uiautomator.Until; import org.junit.After; import org.junit.Before; diff --git a/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.java b/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.java index 58a2fd3ee9b..41a38291013 100644 --- a/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.java +++ b/tests/uitests/src/com/android/settings/ui/SyncSettingsTest.java @@ -20,15 +20,15 @@ import static junit.framework.Assert.assertTrue; import android.os.RemoteException; import android.provider.Settings; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.Until; import android.system.helpers.SettingsHelper; import androidx.test.InstrumentationRegistry; import androidx.test.filters.MediumTest; import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import org.junit.After; import org.junit.Before; diff --git a/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.java b/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.java index d637c539ffb..49b602e189b 100644 --- a/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.java +++ b/tests/uitests/src/com/android/settings/ui/WirelessNetworkSettingsTests.java @@ -24,9 +24,6 @@ import android.net.wifi.WifiManager; import android.os.RemoteException; import android.platform.test.annotations.Presubmit; import android.provider.Settings; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.Until; import android.system.helpers.CommandsHelper; import android.system.helpers.SettingsHelper; import android.test.suitebuilder.annotation.MediumTest; @@ -34,6 +31,9 @@ import android.util.Log; import androidx.test.InstrumentationRegistry; import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.Until; import org.junit.After; import org.junit.Before; diff --git a/tests/uitests/src/com/android/settings/ui/ZonePickerSettingsTest.java b/tests/uitests/src/com/android/settings/ui/ZonePickerSettingsTest.java index 4cb7ad97baa..16a5f840c86 100644 --- a/tests/uitests/src/com/android/settings/ui/ZonePickerSettingsTest.java +++ b/tests/uitests/src/com/android/settings/ui/ZonePickerSettingsTest.java @@ -25,21 +25,21 @@ import static org.junit.Assert.assertTrue; import android.os.RemoteException; import android.os.SystemProperties; import android.provider.Settings; -import android.support.test.uiautomator.By; -import android.support.test.uiautomator.BySelector; -import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.UiObject; -import android.support.test.uiautomator.UiObject2; -import android.support.test.uiautomator.UiObjectNotFoundException; -import android.support.test.uiautomator.UiScrollable; -import android.support.test.uiautomator.UiSelector; -import android.support.test.uiautomator.Until; import android.system.helpers.SettingsHelper; import android.system.helpers.SettingsHelper.SettingsType; import androidx.test.InstrumentationRegistry; import androidx.test.filters.MediumTest; import androidx.test.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.BySelector; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.UiObjectNotFoundException; +import androidx.test.uiautomator.UiScrollable; +import androidx.test.uiautomator.UiSelector; +import androidx.test.uiautomator.Until; import org.junit.After; import org.junit.Before; diff --git a/tests/uitests/src/com/android/settings/ui/inputmethods/DataSaverSummaryUITest.java b/tests/uitests/src/com/android/settings/ui/inputmethods/DataSaverSummaryUITest.java index fd8c0542e1c..fa857bd43e6 100644 --- a/tests/uitests/src/com/android/settings/ui/inputmethods/DataSaverSummaryUITest.java +++ b/tests/uitests/src/com/android/settings/ui/inputmethods/DataSaverSummaryUITest.java @@ -21,13 +21,13 @@ import static com.google.common.truth.Truth.assertThat; import android.app.Instrumentation; import android.content.Intent; -import android.support.test.uiautomator.By; -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.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import org.junit.Before; import org.junit.Test; diff --git a/tests/uitests/src/com/android/settings/ui/inputmethods/SpellCheckerSettingsUITest.java b/tests/uitests/src/com/android/settings/ui/inputmethods/SpellCheckerSettingsUITest.java index 9c18da5e972..a46a00de657 100644 --- a/tests/uitests/src/com/android/settings/ui/inputmethods/SpellCheckerSettingsUITest.java +++ b/tests/uitests/src/com/android/settings/ui/inputmethods/SpellCheckerSettingsUITest.java @@ -21,13 +21,13 @@ import static com.google.common.truth.Truth.assertThat; import android.app.Instrumentation; import android.content.Intent; -import android.support.test.uiautomator.By; -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.runner.AndroidJUnit4; +import androidx.test.uiautomator.By; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; import org.junit.Before; import org.junit.Test; diff --git a/tests/uitests/src/com/android/settings/ui/testutils/SettingsTestUtils.java b/tests/uitests/src/com/android/settings/ui/testutils/SettingsTestUtils.java index 9b1be14bfa5..eb8e33c1c2c 100644 --- a/tests/uitests/src/com/android/settings/ui/testutils/SettingsTestUtils.java +++ b/tests/uitests/src/com/android/settings/ui/testutils/SettingsTestUtils.java @@ -18,11 +18,11 @@ package com.android.settings.ui.testutils; import static org.junit.Assert.assertNotNull; -import android.support.test.uiautomator.By; -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.uiautomator.By; +import androidx.test.uiautomator.Direction; +import androidx.test.uiautomator.UiDevice; +import androidx.test.uiautomator.UiObject2; +import androidx.test.uiautomator.Until; public class SettingsTestUtils {