From 91c1a434c1c44072a02e7255a7d3fa8f8093e8bd Mon Sep 17 00:00:00 2001
From: Aga Wronska <agawronska@google.com>
Date: Tue, 8 Mar 2016 15:45:29 -0800
Subject: [PATCH] Added word 'selected' to action bar description of selected
 elements

Bug: 27296839
Change-Id: I30d3b726f281872da298dbc481a22241fbd45a9a
---
 packages/DocumentsUI/res/values/strings.xml                  | 5 +++++
 .../com/android/documentsui/dirlist/DirectoryFragment.java   | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/DocumentsUI/res/values/strings.xml b/packages/DocumentsUI/res/values/strings.xml
index 6e1b30e97b305..e2d1870cb122d 100644
--- a/packages/DocumentsUI/res/values/strings.xml
+++ b/packages/DocumentsUI/res/values/strings.xml
@@ -213,4 +213,9 @@
         <item quantity="one">Delete <xliff:g id="count" example="1">%1$d</xliff:g> file?</item>
         <item quantity="other">Delete <xliff:g id="count" example="3">%1$d</xliff:g> files?</item>
     </plurals>
+    <!-- Label text showing user how many items are selected. Can be one or more elements. -->
+    <plurals name="elements_selected">
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> selected</item>
+        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> selected</item>
+    </plurals>
 </resources>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
index 19679231c1305..b4f23bf92d517 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java
@@ -526,7 +526,8 @@ public class DirectoryFragment extends Fragment
             getActivity().getWindow().setStatusBarColor(color.data);
 
             if (mActionMode != null) {
-                mActionMode.setTitle(String.valueOf(mSelected.size()));
+                mActionMode.setTitle(Shared.getQuantityString(getActivity(),
+                        R.plurals.elements_selected, mSelected.size()));
             }
         }