diff options
| author | Tomasz Mikolajewski <mtomasz@google.com> | 2015-04-23 17:13:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-23 17:13:33 +0000 |
| commit | 366459ee59d9e4f00eb4bdd10945a72cbc265f76 (patch) | |
| tree | 9e949b0f257f3d2d8b63172d66d37bcf6b800481 | |
| parent | cfa26c2a387e4b1e56e9e734a66a4858dca16899 (diff) | |
| parent | eafb267bd94eb990a07816bb8a501d3c3f90c296 (diff) | |
| download | frameworks_base-366459ee59d9e4f00eb4bdd10945a72cbc265f76.zip frameworks_base-366459ee59d9e4f00eb4bdd10945a72cbc265f76.tar.gz frameworks_base-366459ee59d9e4f00eb4bdd10945a72cbc265f76.tar.bz2 | |
Merge "Update strings for the copy error dialog to match the latest specs."
| -rw-r--r-- | packages/DocumentsUI/res/values/strings.xml | 12 | ||||
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java | 2 |
2 files changed, 5 insertions, 9 deletions
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 3aaa361..00b0f78 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/FailureDialogFragment.java @@ -89,11 +89,9 @@ public class FailureDialogFragment extends DialogFragment list.toString()); return new AlertDialog.Builder(getActivity()) - .setTitle(getString(R.string.copy_failure_alert_title)) .setMessage(Html.fromHtml(message)) .setPositiveButton(R.string.retry, this) .setNegativeButton(android.R.string.cancel, this) - .setIcon(android.R.drawable.ic_dialog_alert) .create(); } } |