diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-06-11 18:21:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 18:21:08 +0000 |
| commit | 8a26514687ccf651eb73d5acdd3ae7c62d247d97 (patch) | |
| tree | b287fc25e4ffa27b55322f1bb25f4f500072539a /packages/DocumentsUI | |
| parent | ffb46022b30dffdf1cc4cbd08d4bcbe51e1f8814 (diff) | |
| parent | f491c72e4a0b6d692aaf459a9a45a8c1462e713b (diff) | |
| download | frameworks_base-8a26514687ccf651eb73d5acdd3ae7c62d247d97.zip frameworks_base-8a26514687ccf651eb73d5acdd3ae7c62d247d97.tar.gz frameworks_base-8a26514687ccf651eb73d5acdd3ae7c62d247d97.tar.bz2 | |
Merge "Selected count string needs plurals." into mnc-dev
Diffstat (limited to 'packages/DocumentsUI')
| -rw-r--r-- | packages/DocumentsUI/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/packages/DocumentsUI/res/values/strings.xml b/packages/DocumentsUI/res/values/strings.xml index 943104d..a4e6ce7 100644 --- a/packages/DocumentsUI/res/values/strings.xml +++ b/packages/DocumentsUI/res/values/strings.xml @@ -68,9 +68,6 @@ <!-- Button label that copies files to the current directory [CHAR LIMIT=24] --> <string name="button_copy">Copy</string> - <!-- Action mode title summarizing the number of documents selected [CHAR LIMIT=32] --> - <string name="mode_selected_count"><xliff:g id="count" example="3">%1$d</xliff:g> selected</string> - <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] --> <string name="sort_name">By name</string> <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] --> diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java index a789da8..f4be9c5 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java @@ -54,6 +54,7 @@ import android.os.OperationCanceledException; import android.os.Parcelable; import android.provider.DocumentsContract; import android.provider.DocumentsContract.Document; +import android.text.TextUtils; import android.text.format.DateUtils; import android.text.format.Formatter; import android.text.format.Time; @@ -474,8 +475,7 @@ public class DirectoryFragment extends Fragment { @Override public boolean onCreateActionMode(ActionMode mode, Menu menu) { mode.getMenuInflater().inflate(R.menu.mode_directory, menu); - mode.setTitle(getResources() - .getString(R.string.mode_selected_count, mCurrentView.getCheckedItemCount())); + mode.setTitle(TextUtils.formatSelectedCount(mCurrentView.getCheckedItemCount())); return true; } @@ -571,8 +571,7 @@ public class DirectoryFragment extends Fragment { } } - mode.setTitle(getResources() - .getString(R.string.mode_selected_count, mCurrentView.getCheckedItemCount())); + mode.setTitle(TextUtils.formatSelectedCount(mCurrentView.getCheckedItemCount())); } }; |