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

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

Merge "Update uiautomator references in packages/apps/DocumentsUI/"

parents 71b65eb9 62db0755

app-perf-tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ android_test { 
        "androidx.legacy_legacy-support-v4",

        "collector-device-lib",

        "mockito-target",

        "ub-uiautomator",

        "androidx.test.uiautomator_uiautomator",

    ],



    platform_apis: true,

app-perf-tests/src/com/android/documentsui/FilesAppPerfTest.java

+2 −1
Original line number Diff line number Diff line
@@ -32,9 +32,10 @@ import android.content.pm.ResolveInfo; 
import android.os.Bundle;

import android.os.SystemClock;

import android.provider.DocumentsContract;

import android.support.test.uiautomator.UiDevice;

import android.util.Log;



import androidx.test.uiautomator.UiDevice;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

perf-tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ android_test { 
        "androidx.test.espresso.core",

        "mockito-target",

        "ub-janktesthelper",

        "ub-uiautomator",

        "androidx.test.uiautomator_uiautomator",

    ],



    platform_apis: true,

perf-tests/src/com/android/documentsui/FilesJankPerfTest.java

+8 −11
Original line number Diff line number Diff line
@@ -16,27 +16,24 @@ 


package com.android.documentsui;



import static com.android.documentsui.StressProvider.DEFAULT_AUTHORITY;

import static com.android.documentsui.StressProvider.STRESS_ROOT_0_ID;

import static com.android.documentsui.StressProvider.STRESS_ROOT_2_ID;



import android.app.Activity;

import android.os.RemoteException;

import android.test.suitebuilder.annotation.LargeTest;



import android.app.UiAutomation;

import android.content.Intent;

import android.content.Context;

import android.content.Intent;

import android.os.RemoteException;

import android.support.test.jank.GfxMonitor;

import android.support.test.jank.JankTest;

import android.support.test.jank.JankTestBase;

import android.support.test.uiautomator.UiDevice;

import android.support.test.jank.GfxMonitor;

import android.support.test.uiautomator.UiScrollable;

import android.util.Log;

import android.test.suitebuilder.annotation.LargeTest;



import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.UiScrollable;



import com.android.documentsui.bots.DirectoryListBot;

import com.android.documentsui.bots.SidebarBot;

import com.android.documentsui.files.FilesActivity;

import com.android.documentsui.bots.DirectoryListBot;



@LargeTest

public class FilesJankPerfTest extends JankTestBase {

tests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ android_test { 
        "androidx.test.ext.truth",

        "guava",

        "mockito-target",

        "ub-uiautomator",

        "androidx.test.uiautomator_uiautomator",

    ],



    jarjar_rules: "jarjar-rules.txt",