From eafb267bd94eb990a07816bb8a501d3c3f90c296 Mon Sep 17 00:00:00 2001
From: Tomasz Mikolajewski <mtomasz@google.com>
Date: Tue, 21 Apr 2015 14:25:24 +0200
Subject: Update strings for the copy error dialog to match the latest specs.

Change-Id: I9adeff3e7e9435237b4b3337e4c687eec39b0335
---
 packages/DocumentsUI/res/values/strings.xml                  | 12 +++++-------
 .../src/com/android/documentsui/FailureDialogFragment.java   |  2 --
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'packages/DocumentsUI')

diff --git a/packages/DocumentsUI/res/values/strings.xml b/packages/DocumentsUI/res/values/strings.xml
index 062d433..5281087 100644
--- a/packages/DocumentsUI/res/values/strings.xml
+++ b/packages/DocumentsUI/res/values/strings.xml
@@ -121,22 +121,20 @@
     <string name="copy_remaining"><xliff:g id="duration" example="3 minutes">%s</xliff:g> left</string>
     <!-- Toast shown when a file copy is kicked off -->
     <plurals name="copy_begin">
-      <item quantity="one">Copying <xliff:g id="count" example="1">%1$d</xliff:g> file.</item>
-      <item quantity="other">Copying <xliff:g id="count" example="3">%1$d</xliff:g> files.</item>
+        <item quantity="one">Copying <xliff:g id="count" example="1">%1$d</xliff:g> file.</item>
+        <item quantity="other">Copying <xliff:g id="count" example="3">%1$d</xliff:g> files.</item>
     </plurals>
     <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
     <string name="copy_preparing">Preparing for copy\u2026</string>
     <!-- Title of the copy error notification [CHAR LIMIT=48] -->
     <plurals name="copy_error_notification_title">
-      <item quantity="one">Error copying <xliff:g id="count" example="1">%1$d</xliff:g> file.</item>
-      <item quantity="other">Error copying <xliff:g id="count" example="1">%1$d</xliff:g> files.</item>
+        <item quantity="one">Couldn\'t copy <xliff:g id="count" example="1">%1$d</xliff:g> file</item>
+        <item quantity="other">Couldn\'t copy <xliff:g id="count" example="2">%1$d</xliff:g> files</item>
     </plurals>
     <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
     <string name="notification_touch_for_details">Touch to view details</string>
     <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
     <string name="retry">Retry</string>
-    <!-- Title of the copying failure alert dialog. [CHAR LIMIT=48] -->
-    <string name="copy_failure_alert_title">Error copying files</string>
     <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
-    <string name="copy_failure_alert_content">Following files are not copied: <xliff:g id="list">%1$s</xliff:g></string>
+    <string name="copy_failure_alert_content">These files weren\'t copied: <xliff:g id="list">%1$s</xliff:g></string>
 </resources>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java b/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java
index 1748c9c..7d16090 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java
@@ -88,12 +88,10 @@ public class FailureDialogFragment extends DialogFragment
                 list.toString());
 
         return new AlertDialog.Builder(getActivity())
-            .setTitle(getString(R.string.copy_failure_alert_title))
             .setMessage(Html.fromHtml(message))
             // TODO: Implement retrying the copy operation.
             .setPositiveButton(R.string.retry, this)
             .setNegativeButton(android.R.string.cancel, this)
-            .setIcon(android.R.drawable.ic_dialog_alert)
             .create();
     }
 }
-- 
cgit v1.1