Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316
am: 8d16e20d78
am: 29f3d022f7
am: 924208bb0f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350 Change-Id: I4bdbd1c3804da01c002b139990e9c9a6745a067f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -18,7 +18,7 @@ android_test {
|
||||
|
||||
static_libs: [
|
||||
"androidx.test.rules",
|
||||
"ub-uiautomator",
|
||||
"androidx.test.uiautomator_uiautomator",
|
||||
],
|
||||
|
||||
// Include all test java files.
|
||||
|
@@ -22,13 +22,13 @@ import static junit.framework.TestCase.fail;
|
||||
import android.app.Instrumentation;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.support.test.uiautomator.By;
|
||||
import android.support.test.uiautomator.UiDevice;
|
||||
import android.support.test.uiautomator.UiSelector;
|
||||
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.UiSelector;
|
||||
import androidx.test.uiautomator.Until;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
|
Reference in New Issue
Block a user