commit 4a526b294a76ce04cc0352e75d8b1d3337f5f16b
author Wenyi Wang <wenyiw@google.com> Fri Jun 17 23:45:32 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 17 23:45:32 2016 +0000
tree acc87632c758ec30ddbcabfe2340a43ebfbcf37b
parent ed4a4cc8e118c58dfe50ef9499d13a6a6cdf4080
parent cb117bd9a24d285e905d1a53791bc1a550f6d615

Merge "Reload groups and filters when provider status changes"

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3ff56c3..0358caa 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -240,6 +240,7 @@
     </style>
 
     <style name="ContactsActionBarTitleTextAppCompat" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:textSize">20dp</item>
         <item name="android:textColor">@color/actionbar_text_color</item>
     </style>
 

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

diff --git a/src/com/android/contacts/group/GroupMembersListAdapter.java b/src/com/android/contacts/group/GroupMembersListAdapter.java
index 0f3ae8a..e84dde7 100644
--- a/src/com/android/contacts/group/GroupMembersListAdapter.java
+++ b/src/com/android/contacts/group/GroupMembersListAdapter.java
@@ -73,6 +73,7 @@
     public GroupMembersListAdapter(Context context) {
         super(context, GroupMembersQuery.RAW_CONTACT_ID);
         mUnknownNameText = context.getText(R.string.missing_name);
+        setSectionHeaderDisplayEnabled(true);
     }
 
     /** Sets the ID of the group whose members will be displayed. */
@@ -94,7 +95,6 @@
                 .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
                         String.valueOf(Directory.DEFAULT))
                 .appendQueryParameter(Contacts.EXTRA_ADDRESS_BOOK_INDEX, "true")
-                .appendQueryParameter(Contacts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS, "true")
                 .build());
 
         loader.setSelection(Data.MIMETYPE + "=?" + " AND " + GroupMembership.GROUP_ROW_ID + "=?");
@@ -132,7 +132,6 @@
         final ContactListItemView view =
                 super.newView(context, partition, cursor, position, parent);
         view.setUnknownNameText(mUnknownNameText);
-        view.setQuickContactEnabled(isQuickContactEnabled());
         return view;
     }
 
@@ -141,10 +140,21 @@
         super.bindView(v, partition, cursor, position);
         final ContactListItemView view = (ContactListItemView) v;
         bindViewId(view, cursor, GroupMembersQuery.CONTACT_ID);
+        bindSectionHeaderAndDivider(view, position);
         bindName(view, cursor);
         bindPhoto(view, cursor);
     }
 
+    protected void bindSectionHeaderAndDivider(ContactListItemView view, int position) {
+        view.setIsSectionHeaderEnabled(isSectionHeaderDisplayEnabled());
+        if (isSectionHeaderDisplayEnabled()) {
+            final Placement placement = getItemPlacementInSection(position);
+            view.setSectionHeader(placement.sectionHeader);
+        } else {
+            view.setSectionHeader(null);
+        }
+    }
+
     private void bindName(ContactListItemView view, Cursor cursor) {
         view.showDisplayName(cursor, GroupMembersQuery.CONTACT_DISPLAY_NAME,
                 getContactNameDisplayOrder());