Move to `androidx.test.uiautomator`.
Test: Existing unit tests pass.
Change-Id: I29a0fe06f558ff43c3137e3cbf033d1574ac3b92
diff --git a/libraries/health/rules/Android.bp b/libraries/health/rules/Android.bp
index 89bd707..d74023b 100644
--- a/libraries/health/rules/Android.bp
+++ b/libraries/health/rules/Android.bp
@@ -17,10 +17,10 @@
sdk_version: "test_current",
static_libs: [
"androidx.test.runner",
+ "androidx.test.uiautomator",
"app-helpers-handheld-interfaces",
"guava",
"memory-helper",
- "ub-uiautomator"
],
srcs: ["src/**/*.java"],
}
diff --git a/libraries/health/rules/src/android/platform/test/rule/DisableAutofillRule.java b/libraries/health/rules/src/android/platform/test/rule/DisableAutofillRule.java
index ec936d0..53dca81 100644
--- a/libraries/health/rules/src/android/platform/test/rule/DisableAutofillRule.java
+++ b/libraries/health/rules/src/android/platform/test/rule/DisableAutofillRule.java
@@ -16,10 +16,10 @@
package android.platform.test.rule;
-import android.support.test.uiautomator.UiDevice;
import android.text.TextUtils;
import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.uiautomator.UiDevice;
import org.junit.runner.Description;
diff --git a/libraries/health/rules/src/android/platform/test/rule/QuickstepPressureRule.java b/libraries/health/rules/src/android/platform/test/rule/QuickstepPressureRule.java
index bcd9778..40bc167 100644
--- a/libraries/health/rules/src/android/platform/test/rule/QuickstepPressureRule.java
+++ b/libraries/health/rules/src/android/platform/test/rule/QuickstepPressureRule.java
@@ -17,9 +17,10 @@
package android.platform.test.rule;
import android.os.SystemClock;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.Until;
+
import androidx.annotation.VisibleForTesting;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.Until;
import org.junit.runner.Description;
diff --git a/libraries/health/rules/src/android/platform/test/rule/TestWatcher.java b/libraries/health/rules/src/android/platform/test/rule/TestWatcher.java
index 9cd06fc..5ea6250 100644
--- a/libraries/health/rules/src/android/platform/test/rule/TestWatcher.java
+++ b/libraries/health/rules/src/android/platform/test/rule/TestWatcher.java
@@ -17,9 +17,10 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.test.uiautomator.UiDevice;
import android.util.Log;
+
import androidx.test.InstrumentationRegistry;
+import androidx.test.uiautomator.UiDevice;
import java.io.IOException;
diff --git a/libraries/health/rules/src/android/platform/test/rule/UnlockScreenRule.java b/libraries/health/rules/src/android/platform/test/rule/UnlockScreenRule.java
index a1ca34a..365a97c 100644
--- a/libraries/health/rules/src/android/platform/test/rule/UnlockScreenRule.java
+++ b/libraries/health/rules/src/android/platform/test/rule/UnlockScreenRule.java
@@ -16,8 +16,9 @@
package android.platform.test.rule;
import android.os.RemoteException;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.BySelector;
+
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.BySelector;
import org.junit.runner.Description;
diff --git a/libraries/health/rules/tests/src/android/platform/test/rule/NaturalOrientationRuleTest.java b/libraries/health/rules/tests/src/android/platform/test/rule/NaturalOrientationRuleTest.java
index 76e79a8..4a4c878 100644
--- a/libraries/health/rules/tests/src/android/platform/test/rule/NaturalOrientationRuleTest.java
+++ b/libraries/health/rules/tests/src/android/platform/test/rule/NaturalOrientationRuleTest.java
@@ -19,14 +19,13 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import android.support.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.UiDevice;
import org.junit.Test;
import org.junit.runner.Description;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.junit.runners.model.Statement;
-
import org.mockito.Mockito;
/**
diff --git a/libraries/health/rules/tests/src/android/platform/test/rule/PressHomeRuleTest.java b/libraries/health/rules/tests/src/android/platform/test/rule/PressHomeRuleTest.java
index 3e836fa..2119274 100644
--- a/libraries/health/rules/tests/src/android/platform/test/rule/PressHomeRuleTest.java
+++ b/libraries/health/rules/tests/src/android/platform/test/rule/PressHomeRuleTest.java
@@ -15,20 +15,19 @@
*/
package android.platform.test.rule;
-import android.os.Bundle;
-
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import android.support.test.uiautomator.UiDevice;
+import android.os.Bundle;
+
+import androidx.test.uiautomator.UiDevice;
import org.junit.Test;
import org.junit.runner.Description;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.junit.runners.model.Statement;
-
import org.mockito.Mockito;
/**
diff --git a/libraries/health/rules/tests/src/android/platform/test/rule/UnlockScreenRuleTest.java b/libraries/health/rules/tests/src/android/platform/test/rule/UnlockScreenRuleTest.java
index 475e43f..739195b 100644
--- a/libraries/health/rules/tests/src/android/platform/test/rule/UnlockScreenRuleTest.java
+++ b/libraries/health/rules/tests/src/android/platform/test/rule/UnlockScreenRuleTest.java
@@ -20,14 +20,14 @@
import static org.mockito.Mockito.when;
import android.os.RemoteException;
-import android.support.test.uiautomator.UiDevice;
+
+import androidx.test.uiautomator.UiDevice;
import org.junit.Test;
import org.junit.runner.Description;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.junit.runners.model.Statement;
-
import org.mockito.Mockito;
/** Unit test the logic for {@link UnlockScreenRule} */
