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

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

Snap for 11426397 from 7579aba1 to 24Q2-release 

Change-Id: I572905ff5e217ccf27e7da95606d239e944d19b9
parents 9b579f9d 7579aba1

src/com/android/documentsui/HorizontalBreadcrumb.java

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ public final class HorizontalBreadcrumb extends RecyclerView implements Breadcru 
        mLayoutManager = new HorizontalBreadcrumbLinearLayoutManager(

                getContext(), LinearLayoutManager.HORIZONTAL, false);

        mAdapter = new BreadcrumbAdapter(state, env, this::onKey);

        mAdapter.setHasStableIds(true);

        // Since we are using GestureDetector to detect click events, a11y services don't know which

        // views are clickable because we aren't using View.OnClickListener. Thus, we need to use a

        // custom accessibility delegate to route click events correctly.

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

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.google.android.material.textfield.TextInputEditText; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -192,6 +193,7 @@ public class DialogUiTest { 
    }



    @Test

    @Ignore

    public void testCreateDirectoryFragmentShows_textInputEditText_shouldNotTruncateOnLandscape()

            throws Throwable {

        switchOrientation(mActivityTestRule.getActivity());

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

+2 −2
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 


    // Copy Internal Storage -> Internal Storage //

    @HugeLongTest

    public void testCopyDocuments_InternalStorage() throws Exception {

    public void ignored_testCopyDocuments_InternalStorage() throws Exception {

        createDocuments(StubProvider.ROOT_0_ID, rootDir0, mDocsHelper);

        copyFiles(StubProvider.ROOT_0_ID, StubProvider.ROOT_1_ID);
@@ -472,7 +472,7 @@ public class FileCopyUiTest extends ActivityTest<FilesActivity> { 
    }



    @HugeLongTest

    public void testCopyDocuments_documentsDisabled() throws Exception {

    public void ignored_testCopyDocuments_documentsDisabled() throws Exception {

        mDocsHelper.createDocument(rootDir0, "text/plain", fileName1);

        bots.roots.openRoot(StubProvider.ROOT_0_ID);

        bots.directory.selectDocument(fileName1, 1);

tests/unit/com/android/documentsui/GlobalSearchLoaderTest.java

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ public class GlobalSearchLoaderTest { 


    @Test

    public void testNotLocalOnlyRoot_beIgnored() {

        if (isPrivateSpaceEnabled) return;

        TestProvidersAccess.PICKLES.flags |= DocumentsContract.Root.FLAG_SUPPORTS_SEARCH;

        assertTrue(mLoader.shouldIgnoreRoot(TestProvidersAccess.PICKLES));

        TestProvidersAccess.PICKLES.flags &= ~DocumentsContract.Root.FLAG_SUPPORTS_SEARCH;

tests/unit/com/android/documentsui/dirlist/AppsRowManagerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -112,14 +112,14 @@ public class AppsRowManagerTest { 
        when(mActivity.findViewById(R.id.apps_group)).thenReturn(mAppsGroup);

        when(mActivity.getSelectedUser()).thenReturn(TestProvidersAccess.USER_ID);



        isPrivateSpaceEnabled = SdkLevel.isAtLeastS() && isPrivateSpaceEnabled;

        isPrivateSpaceEnabled &= SdkLevel.isAtLeastS();

        if (isPrivateSpaceEnabled) {

            mTestConfigStore.enablePrivateSpaceInPhotoPicker();

        }

    }



    private AppsRowManager getAppsRowManager() {

        if (isPrivateSpaceEnabled) {

        if (isPrivateSpaceEnabled && SdkLevel.isAtLeastS()) {

            mTestUserManagerState = new TestUserManagerState();

            mTestUserManagerState.userIds =

                    Lists.newArrayList(UserId.DEFAULT_USER, TestProvidersAccess.OtherUser.USER_ID,