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

Commit 4e201cee authored by Yichun Li's avatar Yichun Li Committed by Android (Google) Code Review
Browse files

Merge "Update uiautomator references in frameworks/base/packages/Shell/tests"

parents 7ec14c20 88bfacfc

packages/Shell/tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ android_test { 
    static_libs: [

        "androidx.test.rules",

        "mockito-target-minus-junit4",

        "ub-uiautomator",

        "androidx.test.uiautomator_uiautomator",

        "junit",

    ],

    platform_apis: true,

packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java

+4 −4
Original line number Diff line number Diff line
@@ -59,10 +59,6 @@ import android.os.ParcelFileDescriptor; 
import android.os.SystemClock;

import android.os.SystemProperties;

import android.service.notification.StatusBarNotification;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.UiObject;

import android.support.test.uiautomator.UiObject2;

import android.support.test.uiautomator.UiObjectNotFoundException;

import android.text.TextUtils;

import android.text.format.DateUtils;

import android.util.Log;
@@ -71,6 +67,10 @@ import androidx.test.InstrumentationRegistry; 
import androidx.test.filters.LargeTest;

import androidx.test.rule.ServiceTestRule;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.UiObject;

import androidx.test.uiautomator.UiObject2;

import androidx.test.uiautomator.UiObjectNotFoundException;



import com.android.shell.ActionSendMultipleConsumerActivity.CustomActionSendMultipleListener;

packages/Shell/tests/src/com/android/shell/UiBot.java

+8 −7
Original line number Diff line number Diff line
@@ -19,16 +19,17 @@ package com.android.shell; 
import android.app.Instrumentation;

import android.app.StatusBarManager;

import android.os.SystemClock;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.UiObject;

import android.support.test.uiautomator.UiObject2;

import android.support.test.uiautomator.UiObjectNotFoundException;

import android.support.test.uiautomator.UiSelector;

import android.support.test.uiautomator.Until;

import android.text.format.DateUtils;

import android.util.Log;



import androidx.test.uiautomator.By;

import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.UiObject;

import androidx.test.uiautomator.UiObject2;

import androidx.test.uiautomator.UiObjectNotFoundException;

import androidx.test.uiautomator.UiSelector;

import androidx.test.uiautomator.Until;



import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertNotNull;

import static junit.framework.Assert.assertTrue;