Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6839e1a1 authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Android (Google) Code Review
Browse files

Merge "Update UiAutomator imports" into main

parents 3bd20d42 1242542d

tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/AutoShowTest.java

+4 −4
Original line number Diff line number Diff line
@@ -37,14 +37,14 @@ import android.content.res.Configuration; 
import android.os.SystemClock;

import android.platform.test.annotations.RootPermissionTest;

import android.platform.test.rule.UnlockScreenRule;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.UiObject2;

import android.support.test.uiautomator.Until;

import android.view.WindowManager;

import android.widget.EditText;



import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.uiautomator.By;

import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.UiObject2;

import androidx.test.uiautomator.Until;



import org.junit.Rule;

import org.junit.Test;

tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/DefaultImeVisibilityTest.java

+1 −1
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ import static com.google.common.truth.Truth.assertWithMessage; 
import android.content.Intent;

import android.platform.test.annotations.RootPermissionTest;

import android.platform.test.rule.UnlockScreenRule;

import android.support.test.uiautomator.UiDevice;

import android.widget.EditText;



import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.uiautomator.UiDevice;



import org.junit.Rule;

import org.junit.Test;

tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/ImeOpenCloseStressTest.java

+1 −1
Original line number Diff line number Diff line
@@ -48,12 +48,12 @@ import android.os.Build; 
import android.os.SystemClock;

import android.platform.test.annotations.RootPermissionTest;

import android.platform.test.rule.UnlockScreenRule;

import android.support.test.uiautomator.UiDevice;

import android.util.Log;

import android.view.WindowManager;

import android.widget.EditText;



import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.uiautomator.UiDevice;



import org.junit.Rule;

import org.junit.Test;

tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/ImeStressTestRule.java

+1 −1
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ package com.android.inputmethod.stresstest; 


import android.app.Instrumentation;

import android.os.RemoteException;

import android.support.test.uiautomator.UiDevice;



import androidx.annotation.NonNull;

import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.uiautomator.UiDevice;



import org.junit.rules.TestWatcher;

import org.junit.runner.Description;