diff options
| author | Vadim Tryshev <vadimt@google.com> | 2018-08-15 15:28:47 -0700 |
|---|---|---|
| committer | Jeff Gaston <jeffrygaston@google.com> | 2018-08-21 15:04:48 -0400 |
| commit | 0a9f3ab4a6acf1a5560d4e4039c88a697529d9d4 (patch) | |
| tree | 66bef7bcd61632bb01dbc336061da3abb510293b /tests/src/com/android/launcher3/util | |
| parent | 58ad76fd62daef166346b49847ce23690252a04a (diff) | |
| download | android_packages_apps_Trebuchet-0a9f3ab4a6acf1a5560d4e4039c88a697529d9d4.tar.gz android_packages_apps_Trebuchet-0a9f3ab4a6acf1a5560d4e4039c88a697529d9d4.tar.bz2 android_packages_apps_Trebuchet-0a9f3ab4a6acf1a5560d4e4039c88a697529d9d4.zip | |
Converting tests to Androidx
Bug: 112610679
Change-Id: I712826e668f1fbeb4e47cc541d4f5296d8eb74c0
Diffstat (limited to 'tests/src/com/android/launcher3/util')
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/src/com/android/launcher3/util/Condition.java b/tests/src/com/android/launcher3/util/Condition.java index 78c652a29..b564a1a87 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 fdd8e8886..cbf30b178 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 edd152a2c..1c7160fe5 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 dba2d7100..9f0db2bf9 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; |