Merge "Update uiautomator references in frameworks/base/tests/WindowAnimationJank"
This commit is contained in:
@@ -25,7 +25,7 @@ android_test {
|
|||||||
name: "WindowAnimationJank",
|
name: "WindowAnimationJank",
|
||||||
srcs: ["src/**/*.java"],
|
srcs: ["src/**/*.java"],
|
||||||
static_libs: [
|
static_libs: [
|
||||||
"ub-uiautomator",
|
"androidx.test.uiautomator_uiautomator",
|
||||||
"androidx.test.janktesthelper",
|
"androidx.test.janktesthelper",
|
||||||
"junit",
|
"junit",
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -18,11 +18,12 @@ import android.app.UiAutomation;
|
|||||||
import android.content.ComponentName;
|
import android.content.ComponentName;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.SystemClock;
|
import android.os.SystemClock;
|
||||||
import android.support.test.uiautomator.By;
|
|
||||||
import android.support.test.uiautomator.BySelector;
|
import androidx.test.uiautomator.By;
|
||||||
import android.support.test.uiautomator.UiDevice;
|
import androidx.test.uiautomator.BySelector;
|
||||||
import android.support.test.uiautomator.UiObject2;
|
import androidx.test.uiautomator.UiDevice;
|
||||||
import android.support.test.uiautomator.Until;
|
import androidx.test.uiautomator.UiObject2;
|
||||||
|
import androidx.test.uiautomator.Until;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set of helpers to manipulate test activities.
|
* Set of helpers to manipulate test activities.
|
||||||
|
|||||||
@@ -16,9 +16,8 @@
|
|||||||
|
|
||||||
package android.windowanimationjank;
|
package android.windowanimationjank;
|
||||||
|
|
||||||
import android.support.test.uiautomator.UiDevice;
|
|
||||||
|
|
||||||
import androidx.test.jank.JankTestBase;
|
import androidx.test.jank.JankTestBase;
|
||||||
|
import androidx.test.uiautomator.UiDevice;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This adds additional system level jank monitor and its result is merged with primary monitor
|
* This adds additional system level jank monitor and its result is merged with primary monitor
|
||||||
|
|||||||
Reference in New Issue
Block a user