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

Commit 6967abba authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13503953 from 5802431b to 25Q3-release 

Change-Id: Ia043ee5f4f2833c97e2407580415942190833614
parents 998adc39 5802431b

src/com/android/documentsui/services/FileOperationService.java

+2 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ public class FileOperationService extends Service implements Job.Listener { 


    public static final String ACTION_PROGRESS = "com.android.documentsui.action.PROGRESS";

    public static final String EXTRA_PROGRESS = "com.android.documentsui.PROGRESS";

    public static final String EXTRA_PROGRESS_ID = "com.android.documentsui.PROGRESS_ID";



    @IntDef({

            OPERATION_UNKNOWN,
@@ -629,7 +630,7 @@ public class FileOperationService extends Service implements Job.Listener { 
            Intent intent = new Intent();

            intent.setPackage(getPackageName());

            intent.setAction(ACTION_PROGRESS);

            intent.putExtra("id", mLastId++);

            intent.putExtra(EXTRA_PROGRESS_ID, mLastId++);

            intent.putParcelableArrayListExtra(EXTRA_PROGRESS, progress);

            sendBroadcast(intent);

        }

tests/common/com/android/documentsui/bots/SearchBot.java

+7 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.documentsui.bots;



import static androidx.test.espresso.Espresso.onView;

import static androidx.test.espresso.action.ViewActions.typeText;

import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;

import static androidx.test.espresso.matcher.ViewMatchers.isClickable;

import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
@@ -33,10 +31,14 @@ import static org.hamcrest.CoreMatchers.anyOf; 
import android.content.Context;

import android.view.View;



import androidx.test.uiautomator.By;

import androidx.test.uiautomator.BySelector;

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 com.android.documentsui.R;
@@ -86,7 +88,9 @@ public class SearchBot extends Bots.BaseBot { 
    }



    public void setInputText(String query) throws UiObjectNotFoundException {

        onView(SEARCH_INPUT).perform(typeText(query));

        BySelector selector = By.res(mTargetPackage + ":id/search_src_text");

        UiObject2 searchInput = mDevice.wait(Until.findObject(selector), 5000);

        searchInput.setText(query);

    }



    public void assertIconVisible(boolean visible) {

tests/functional/com/android/documentsui/ArchiveUiTest.java

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public class ArchiveUiTest extends ActivityTestJunit4<FilesActivity> { 
        bots.directory.openDocument("broken.zip");



        final String msg = String.valueOf(context.getString(R.string.empty));

        bots.directory.waitForHolderMessage();

        bots.directory.assertPlaceholderMessageText(msg);

    }