commit 88a73c18a615379afdcce8a53ae78a953c77cb4a
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 07 04:27:54 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 07 04:27:54 2017 +0000
tree fa12111e9fb59a4bb4110fc83d1824812b9391ec
parent 0de8a5e489146f10854dc465961601a4a7360de2
parent 7453f1b4cef7bca65f64ad3e38d4a412960b88e0

Merge "Import translations. DO NOT MERGE" into ub-contactsdialer-i-dev

src/com/android/contacts/drawer/DrawerAdapter.java

diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java
index 5248603..54cd669 100644
--- a/src/com/android/contacts/drawer/DrawerAdapter.java
+++ b/src/com/android/contacts/drawer/DrawerAdapter.java
@@ -130,7 +130,7 @@
         mItemsList.add(mStatusBarSpacerItem);
         mItemsList.add(mNavSpacerItem);
         mItemsList.addAll(mPrimaryItems);
-        if (mAreGroupWritableAccountsAvailable) {
+        if (mAreGroupWritableAccountsAvailable || !mGroupEntries.isEmpty()) {
             mItemsList.add(mGroupHeader);
         }
         mItemsList.addAll(mGroupEntries);

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

diff --git a/src/com/android/contacts/list/DefaultContactListAdapter.java b/src/com/android/contacts/list/DefaultContactListAdapter.java
index bc76331..e50fe48 100644
--- a/src/com/android/contacts/list/DefaultContactListAdapter.java
+++ b/src/com/android/contacts/list/DefaultContactListAdapter.java
@@ -178,13 +178,10 @@
             uri = ContactListAdapter.buildSectionIndexerUri(uri);
         }
 
-        // The "All accounts" filter is the same as the entire contents of Directory.DEFAULT
         if (filter != null
                 && filter.filterType != ContactListFilter.FILTER_TYPE_CUSTOM
                 && filter.filterType != ContactListFilter.FILTER_TYPE_SINGLE_CONTACT) {
             final Uri.Builder builder = uri.buildUpon();
-            builder.appendQueryParameter(
-                    ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Directory.DEFAULT));
             if (filter.filterType == ContactListFilter.FILTER_TYPE_ACCOUNT
                 || filter.filterType == ContactListFilter.FILTER_TYPE_GROUP_MEMBERS) {
                 filter.addAccountQueryParameterToUrl(builder);