Merge b580256d8f2c84a171c12ddbca3f8932165f0484 on remote branch
Change-Id: Ie0a61b8cd0e7558791a353a554e9aeda87f7d297
diff --git a/annotations/Android.bp b/annotations/Android.bp
index 05b9e29..7808fa8 100644
--- a/annotations/Android.bp
+++ b/annotations/Android.bp
@@ -36,4 +36,9 @@
srcs: ["src/**/*.java"],
java_resource_dirs: ["src"],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
}
diff --git a/testapps/libsTest/appTest/src/com/android/tests/libstest/app/MainActivityTest.java b/testapps/libsTest/appTest/src/com/android/tests/libstest/app/MainActivityTest.java
index 65e081b..c413a85 100644
--- a/testapps/libsTest/appTest/src/com/android/tests/libstest/app/MainActivityTest.java
+++ b/testapps/libsTest/appTest/src/com/android/tests/libstest/app/MainActivityTest.java
@@ -17,9 +17,10 @@
package com.android.tests.libstest.app;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
import android.widget.TextView;
+import androidx.test.filters.MediumTest;
+
/**
* An example of an {@link ActivityInstrumentationTestCase2} of a specific activity {@link Focus2}.
* By virtue of extending {@link ActivityInstrumentationTestCase2}, the target activity is automatically
diff --git a/testapps/libsTest/lib1Test/src/com/android/tests/libstest/lib1/MainActivityTest.java b/testapps/libsTest/lib1Test/src/com/android/tests/libstest/lib1/MainActivityTest.java
index 4ed7ae6..3146b90 100644
--- a/testapps/libsTest/lib1Test/src/com/android/tests/libstest/lib1/MainActivityTest.java
+++ b/testapps/libsTest/lib1Test/src/com/android/tests/libstest/lib1/MainActivityTest.java
@@ -17,9 +17,10 @@
package com.android.tests.libstest.lib1;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
import android.widget.TextView;
+import androidx.test.filters.MediumTest;
+
/**
* An example of an {@link ActivityInstrumentationTestCase2} of a specific activity {@link Focus2}.
* By virtue of extending {@link ActivityInstrumentationTestCase2}, the target activity is automatically
diff --git a/testapps/libsTest/lib2Test/src/com/android/tests/libstest/lib2/MainActivityTest.java b/testapps/libsTest/lib2Test/src/com/android/tests/libstest/lib2/MainActivityTest.java
index 6ac4a5c..17f4ffa 100644
--- a/testapps/libsTest/lib2Test/src/com/android/tests/libstest/lib2/MainActivityTest.java
+++ b/testapps/libsTest/lib2Test/src/com/android/tests/libstest/lib2/MainActivityTest.java
@@ -17,10 +17,9 @@
package com.android.tests.libstest.lib2;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
import android.widget.TextView;
-import com.android.tests.libstest.lib2.R;
+import androidx.test.filters.MediumTest;
/**
* An example of an {@link ActivityInstrumentationTestCase2} of a specific activity {@link Focus2}.
diff --git a/testapps/testProjectTest/testapp/src/com/android/tests/testprojecttest/lib/LibActivityTest.java b/testapps/testProjectTest/testapp/src/com/android/tests/testprojecttest/lib/LibActivityTest.java
index 9be6f97..42c850a 100644
--- a/testapps/testProjectTest/testapp/src/com/android/tests/testprojecttest/lib/LibActivityTest.java
+++ b/testapps/testProjectTest/testapp/src/com/android/tests/testprojecttest/lib/LibActivityTest.java
@@ -17,9 +17,10 @@
package com.android.tests.testprojecttest.lib;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
import android.widget.TextView;
+import androidx.test.filters.MediumTest;
+
import com.android.tests.testprojecttest.app.R;
/**
diff --git a/testapps/testProjectTest/testlib/src/com/android/tests/testprojecttest/lib/LibActivityTest.java b/testapps/testProjectTest/testlib/src/com/android/tests/testprojecttest/lib/LibActivityTest.java
index 6632c58..d3f3e5e 100644
--- a/testapps/testProjectTest/testlib/src/com/android/tests/testprojecttest/lib/LibActivityTest.java
+++ b/testapps/testProjectTest/testlib/src/com/android/tests/testprojecttest/lib/LibActivityTest.java
@@ -17,10 +17,9 @@
package com.android.tests.testprojecttest.lib;
import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
import android.widget.TextView;
-import com.android.tests.testprojecttest.lib.R;
+import androidx.test.filters.MediumTest;
/**
* An example of an {@link ActivityInstrumentationTestCase2} of a specific activity {@link Focus2}.