summaryrefslogtreecommitdiffstats
path: root/packages/DocumentsUI/src
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-06-11 18:21:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-11 18:21:08 +0000
commit8a26514687ccf651eb73d5acdd3ae7c62d247d97 (patch)
treeb287fc25e4ffa27b55322f1bb25f4f500072539a /packages/DocumentsUI/src
parentffb46022b30dffdf1cc4cbd08d4bcbe51e1f8814 (diff)
parentf491c72e4a0b6d692aaf459a9a45a8c1462e713b (diff)
downloadframeworks_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/src')
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java7
1 files changed, 3 insertions, 4 deletions
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()));
}
};