commit 5e46db32bcecb60bf343872a5675e809274a7224
author Wenyi Wang <wenyiw@google.com> Tue Jun 28 16:42:35 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 28 16:42:35 2016 +0000
tree eed0d9beb420a90d423f15f5798c125b7b15f37c
parent 6f164197982b2eb29d9e3aa6e2a9cf8991d85c4c
parent 8e73c3694cf108cb19b279f0fdf6f5cc028f0579

Merge "Wait until drawer closes before lauching activities (1/2)"

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4ba767d..12471ef 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -288,13 +288,6 @@
     <!-- The text displayed when the contacts list is empty while displaying all contacts [CHAR LIMIT=NONE] -->
     <string name="noContacts">No contacts</string>
 
-    <!-- Label list header title with the number of members in the label. [CHAR LIMIT=30] -->
-    <plurals name="group_members_count">
-        <item quantity="zero">No contacts</item>
-        <item quantity="one">1 contact</item>
-        <item quantity="other"><xliff:g id="count">%d</xliff:g> contacts</item>
-    </plurals>
-
     <!-- The text displayed when the labels list is empty while displaying all labels [CHAR LIMIT=30] -->
     <string name="noGroups">No labels.</string>
 

src/com/android/contacts/group/GroupMembersFragment.java

diff --git a/src/com/android/contacts/group/GroupMembersFragment.java b/src/com/android/contacts/group/GroupMembersFragment.java
index 45a3834..98d66b4 100644
--- a/src/com/android/contacts/group/GroupMembersFragment.java
+++ b/src/com/android/contacts/group/GroupMembersFragment.java
@@ -285,8 +285,8 @@
 
             final TextView accountFilterHeader = (TextView) accountFilterContainer.findViewById(
                     R.id.account_filter_header);
-            accountFilterHeader.setText(getResources().getQuantityString(
-                    R.plurals.group_members_count, memberCount, memberCount));
+            accountFilterHeader.setText(mGroupMetadata.accountName);
+            accountFilterHeader.setAllCaps(false);
         } else {
             accountFilterContainer.setVisibility(View.GONE);
         }

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

diff --git a/src/com/android/contacts/list/GroupMemberPickerFragment.java b/src/com/android/contacts/list/GroupMemberPickerFragment.java
index 362ff80..f4dde36 100644
--- a/src/com/android/contacts/list/GroupMemberPickerFragment.java
+++ b/src/com/android/contacts/list/GroupMemberPickerFragment.java
@@ -28,6 +28,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import com.android.contacts.activities.ContactSelectionActivity;
 import com.android.contacts.common.R;
@@ -185,6 +186,7 @@
         setPhotoLoaderEnabled(true);
         setSectionHeaderDisplayEnabled(true);
         setHasOptionsMenu(true);
+        setDisplayDirectoryHeader(false);
     }
 
     @Override
@@ -227,6 +229,15 @@
             // Wait until contacts are loaded before showing the scrollbar
             setVisibleScrollbarEnabled(true);
 
+            // Bind account filter header.
+            final View accountFilterContainer = getView().findViewById(
+                    R.id.account_filter_header_container);
+            accountFilterContainer.setVisibility(View.VISIBLE);
+            final TextView accountFilterHeader = (TextView) accountFilterContainer.findViewById(
+                    R.id.account_filter_header);
+            accountFilterHeader.setText(mAccountName);
+            accountFilterHeader.setAllCaps(false);
+
             super.onLoadFinished(loader, new FilterCursorWrapper(data));
         }
     }