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

Commit 3e1bb56a authored by Austin Tankiang's avatar Austin Tankiang
Browse files

Fix copy/move progress message when destination is a root 

A root's base document info may have a different display name to the
root's actual title. `stack.getTitle()` accounts for this, so use that
to get the display name.

Bug: 416141710
Test: atest 'DocumentsUIGoogleTests:com.android.documentsui.services'
Flag: com.android.documentsui.flags.visual_signals_ro
Change-Id: I4eba60e8e4668fc3af01a60bd5a6a74090cfa8ba
parent b97d85e8

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

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ class CopyJob extends ResolvedResourcesJob { 


    protected String getProgressMessage() {

        Map<String, Object> formatArgs = new HashMap<>();

        formatArgs.put("directory", BidiFormatter.getInstance().unicodeWrap(mDstInfo.displayName));

        formatArgs.put("directory", BidiFormatter.getInstance().unicodeWrap(stack.getTitle()));

        return getProgressMessage(R.string.copy_in_progress, formatArgs);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ final class MoveJob extends CopyJob { 
    @Override

    protected String getProgressMessage() {

        Map<String, Object> formatArgs = new HashMap<>();

        formatArgs.put("directory", BidiFormatter.getInstance().unicodeWrap(mDstInfo.displayName));

        formatArgs.put("directory", BidiFormatter.getInstance().unicodeWrap(stack.getTitle()));

        return getProgressMessage(R.string.move_in_progress, formatArgs);

    }

tests/functional/com/android/documentsui/services/AbstractJobTest.java

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public abstract class AbstractJobTest<T extends Job> { 
    final T createJob(@OpType int opType, List<Uri> srcs, Uri srcParent, Uri destination)

            throws Exception {

        DocumentStack stack =

                new DocumentStack(mSrcRoot, DocumentInfo.fromUri(mResolver, destination, mUserId));

                new DocumentStack(mDestRoot, DocumentInfo.fromUri(mResolver, destination, mUserId));



        UrisSupplier urisSupplier = DocsProviders.createDocsProvider(srcs);

        FileOperation operation = new FileOperation.Builder()