From 05b7b15310163938a750bcca84bf41bb9f4129e0 Mon Sep 17 00:00:00 2001 From: Ben Kwa Date: Thu, 28 May 2015 16:18:59 -0700 Subject: [PATCH] Fix text on move notifications and toasts. Some of these still said "copying" instead of "moving". BUG=21366117 Change-Id: Ib50aaa05617f4f8a88069436a954b56f7be15a44 --- packages/DocumentsUI/res/values/strings.xml | 13 ++++++++++++- .../src/com/android/documentsui/CopyService.java | 22 +++++++++++++++------- .../android/documentsui/FailureDialogFragment.java | 5 +++-- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/packages/DocumentsUI/res/values/strings.xml b/packages/DocumentsUI/res/values/strings.xml index 9945f1f41765..7512a4eaf8a6 100644 --- a/packages/DocumentsUI/res/values/strings.xml +++ b/packages/DocumentsUI/res/values/strings.xml @@ -121,6 +121,8 @@ Copying files + + Moving files %s left @@ -132,19 +134,28 @@ Moving %1$d file. Moving %1$d files. - + Preparing for copy\u2026 + + Preparing for move\u2026 Couldn\'t copy %1$d file Couldn\'t copy %1$d files + + + Couldn\'t move %1$d file + Couldn\'t move %1$d files + Touch to view details Retry These files weren\'t copied: %1$s + + These files weren\'t moved: %1$s Copied %1$d file to clipboard. diff --git a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java index 1c97b85a23e8..8ffb06c78107 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/CopyService.java +++ b/packages/DocumentsUI/src/com/android/documentsui/CopyService.java @@ -150,7 +150,7 @@ public class CopyService extends IntentService { mDstClient = DocumentsApplication.acquireUnstableProviderOrThrow(getContentResolver(), stack.peek().authority); - setupCopyJob(srcs, stack); + setupCopyJob(srcs, stack, transferMode); for (int i = 0; i < srcs.size() && !mIsCancelled; ++i) { copy(srcs.get(i), stack.peek(), transferMode); @@ -172,10 +172,12 @@ public class CopyService extends IntentService { navigateIntent.putExtra(EXTRA_FAILURE, FAILURE_COPY); navigateIntent.putParcelableArrayListExtra(EXTRA_SRC_LIST, mFailedFiles); + final int titleResourceId = (transferMode == TRANSFER_MODE_COPY ? + R.plurals.copy_error_notification_title : + R.plurals.move_error_notification_title); final Notification.Builder errorBuilder = new Notification.Builder(this) - .setContentTitle(context.getResources(). - getQuantityString(R.plurals.copy_error_notification_title, - mFailedFiles.size(), mFailedFiles.size())) + .setContentTitle(context.getResources().getQuantityString(titleResourceId, + mFailedFiles.size(), mFailedFiles.size())) .setContentText(getString(R.string.notification_touch_for_details)) .setContentIntent(PendingIntent.getActivity(context, 0, navigateIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_ONE_SHOT)) @@ -199,10 +201,12 @@ public class CopyService extends IntentService { * * @param srcs A list of src files to copy. * @param stack The copy destination stack. + * @param transferMode The mode (i.e. copy, or move) * @throws RemoteException */ - private void setupCopyJob(ArrayList srcs, DocumentStack stack) + private void setupCopyJob(ArrayList srcs, DocumentStack stack, int transferMode) throws RemoteException { + final boolean copying = (transferMode == TRANSFER_MODE_COPY); // Create an ID for this copy job. Use the timestamp. mJobId = String.valueOf(SystemClock.elapsedRealtime()); // Reset the cancellation flag. @@ -212,8 +216,10 @@ public class CopyService extends IntentService { final Intent navigateIntent = new Intent(context, StandaloneActivity.class); navigateIntent.putExtra(EXTRA_STACK, (Parcelable) stack); + final String contentTitle = getString(copying ? R.string.copy_notification_title + : R.string.move_notification_title); mProgressBuilder = new Notification.Builder(this) - .setContentTitle(getString(R.string.copy_notification_title)) + .setContentTitle(contentTitle) .setContentIntent(PendingIntent.getActivity(context, 0, navigateIntent, 0)) .setCategory(Notification.CATEGORY_PROGRESS) .setSmallIcon(R.drawable.ic_menu_copy) @@ -227,8 +233,10 @@ public class CopyService extends IntentService { PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_CANCEL_CURRENT)); // Send an initial progress notification. + final String contentText = getString(copying ? R.string.copy_preparing + : R.string.move_preparing); mProgressBuilder.setProgress(0, 0, true); // Indeterminate progress while setting up. - mProgressBuilder.setContentText(getString(R.string.copy_preparing)); + mProgressBuilder.setContentText(contentText); mNotificationManager.notify(mJobId, 0, mProgressBuilder.build()); // Reset batch parameters. diff --git a/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java b/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java index 8a480faada8a..ea0c18acf26f 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java @@ -84,8 +84,9 @@ public class FailureDialogFragment extends DialogFragment list.append(String.format("• %s
", documentInfo.displayName)); } list.append("

"); - final String message = String.format(getString(R.string.copy_failure_alert_content), - list.toString()); + final String messageFormat = getString(mTransferMode == CopyService.TRANSFER_MODE_COPY ? + R.string.copy_failure_alert_content : R.string.move_failure_alert_content); + final String message = String.format(messageFormat, list.toString()); return new AlertDialog.Builder(getActivity()) .setMessage(Html.fromHtml(message)) -- 2.11.0