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

Commit 86d1b6c3 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6520316 from fc009797 to sc-d1-release 

Change-Id: Iaf6d169f45f0e8c89daab15b69c7ec5dd0890023
parents f7f432c6 fc009797

src/com/android/documentsui/files/Config.java

+2 −8
Original line number Diff line number Diff line
@@ -27,17 +27,11 @@ public final class Config extends ActivityConfig { 


    @Override

    public boolean managedModeEnabled(DocumentStack stack) {

        // This method helps us understand when to kick in special manage mode behaviors.

        final RootInfo root = stack.getRoot();



        // When in Files activity, allow External Storage provider to view

        // Android/[data|obb|sandbox] directories which are otherwise hidden for privacy reasons.

        if (root != null && root.isExternalStorage()) {

            return true;

        }

        // When in downloads top level directory, we also show active downloads.

        // And while we don't allow folders in Downloads, we do allow Zip files in

        // downloads that themselves can be opened and viewed like directories.

        // This method helps us understand when to kick in on those special behaviors.

        final RootInfo root = stack.getRoot();

        return root != null

                && root.isDownloads()

                && stack.size() == 1;

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import androidx.test.InstrumentationRegistry; 
 */

public final class Bots {



    private static final int TIMEOUT = 5000;

    private static final int TIMEOUT = 15000;



    public final BreadBot breadcrumb;

    public final DirectoryListBot directory;

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

+4 −2
Original line number Diff line number Diff line
@@ -57,15 +57,16 @@ public class ActionCreateDocumentUiTest { 
    private Context mTargetContext;

    private Context mContext;

    private Bots mBots;

    private UiDevice mDevice;



    @Before

    public void setup() {

        UiDevice device = UiDevice.getInstance(getInstrumentation());

        UiAutomation automation = getInstrumentation().getUiAutomation();



        mDevice = UiDevice.getInstance(getInstrumentation());

        mTargetContext = getInstrumentation().getTargetContext();

        mContext = getInstrumentation().getContext();

        mBots = new Bots(device, automation, mTargetContext, 5000);

        mBots = new Bots(mDevice, automation, mTargetContext, 5000);

    }



    @Test
@@ -84,6 +85,7 @@ public class ActionCreateDocumentUiTest { 


        mBots.main.setDialogText(fileName);

        mBots.main.clickSaveButton();

        mDevice.waitForIdle();



        Instrumentation.ActivityResult activityResult = mRule.getActivityResult();

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

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class CancelFromNotificationUiTest extends ActivityTest<FilesActivity> { 


    private static final int BUFFER_SIZE = 10 * 1024 * 1024;



    private static final int WAIT_TIME_SECONDS = 60;

    private static final int WAIT_TIME_SECONDS = 120;



    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {

        @Override

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

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ public class ContextMenuUiTest extends ActivityTest<FilesActivity> { 
        menuItems.put("Rename", false);

        menuItems.put("Delete", false);

        menuItems.put("Open in new window", false);

        menuItems.put("Paste into folder", false);

        menuItems.put("Select all", false);

        menuItems.put("New folder", false);

    }