commit 3d8803e4d597da33275b4a67271cb74fed2cdea8
author Wenyi Wang <wenyiw@google.com> Mon Jul 18 14:29:37 2016 -0700
committer Wenyi Wang <wenyiw@google.com> Mon Jul 18 15:02:02 2016 -0700
tree 22315f1a7cc42132b67239b26803b26967b90b25
parent 54339a06b1fb9890e75f7c93ae890987a0e92081

Use different strings for list header

Bug 30189545

Change-Id: Iddcacad2af15b09083e7da1692ceaddb10db20e6

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d72b4b2..f020308 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -208,10 +208,16 @@
 
     <!-- List header indicating the number of contacts in the list [CHAR LIMIT=30] -->
     <plurals name="contacts_count">
-        <item quantity="one">1 contact</item>
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> contact</item>
         <item quantity="other"><xliff:g id="count">%d</xliff:g> contacts</item>
     </plurals>
 
+    <!-- List header indicating the number of contacts and account name in the list [CHAR LIMIT=30] -->
+    <plurals name="contacts_count_with_account">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> contact · <xliff:g id="account">%s</xliff:g></item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> contacts · <xliff:g id="account">%s</xliff:g></item>
+    </plurals>
+
     <!-- Activity title indicating contacts are from a Google account [CHAR LIMIT=30] -->
     <string name="title_from_google">From Google</string>
 

src/com/android/contacts/list/MultiSelectContactsListFragment.java

diff --git a/src/com/android/contacts/list/MultiSelectContactsListFragment.java b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
index bad44eb..6fd15e9 100644
--- a/src/com/android/contacts/list/MultiSelectContactsListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
@@ -327,14 +327,13 @@
         // Set text of count of contacts and account name (if it's a Google account)
         final TextView accountFilterHeader = (TextView) accountFilterContainer.findViewById(
                 R.id.account_filter_header);
-        final String headerText =  String.format(context.getResources().getQuantityString(
-                R.plurals.contacts_count, memberCount), memberCount);
-        final StringBuilder sb = new StringBuilder(headerText);
-        if (GoogleAccountType.ACCOUNT_TYPE.equals(accountWithDataSet.type)) {
-            sb.append(" \u00B7 "); // Unicode character 'MIDDLE DOT'
-            sb.append(accountWithDataSet.name);
-        }
-        accountFilterHeader.setText(sb.toString());
+        final String headerText = GoogleAccountType.ACCOUNT_TYPE.equals(accountWithDataSet.type)
+                ? String.format(context.getResources().getQuantityString(
+                        R.plurals.contacts_count_with_account, memberCount),
+                                memberCount, accountWithDataSet.name)
+                : context.getResources().getQuantityString(
+                        R.plurals.contacts_count, memberCount, memberCount);
+        accountFilterHeader.setText(headerText);
         accountFilterHeader.setAllCaps(false);
 
         // Set icon of the account