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
diff --git a/src/com/android/documentsui/services/CopyJob.java b/src/com/android/documentsui/services/CopyJob.java
index 0606973..4c1538b 100644
--- a/src/com/android/documentsui/services/CopyJob.java
+++ b/src/com/android/documentsui/services/CopyJob.java
@@ -209,7 +209,7 @@
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);
}
diff --git a/src/com/android/documentsui/services/MoveJob.java b/src/com/android/documentsui/services/MoveJob.java
index 7316ee7..84aa661 100644
--- a/src/com/android/documentsui/services/MoveJob.java
+++ b/src/com/android/documentsui/services/MoveJob.java
@@ -100,7 +100,7 @@
@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);
}
diff --git a/tests/functional/com/android/documentsui/services/AbstractJobTest.java b/tests/functional/com/android/documentsui/services/AbstractJobTest.java
index 9509297..1f19d09 100644
--- a/tests/functional/com/android/documentsui/services/AbstractJobTest.java
+++ b/tests/functional/com/android/documentsui/services/AbstractJobTest.java
@@ -126,7 +126,7 @@
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()
