Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 138080ff authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android (Google) Code Review
Browse files

Merge "Fix local profile in contacts list"

parents 78647249 8fdf8908

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

+4 −3
Original line number Diff line number Diff line
@@ -378,7 +378,8 @@ public abstract class ContactBrowseListFragment extends 
            return;

        }



        if (!isSearchMode() && mFilter != null) {

        boolean searchMode = isSearchMode();

        if (!searchMode && mFilter != null) {

            adapter.setFilter(mFilter);

            if (mSelectionRequired

                    || mFilter.filterType == ContactListFilter.FILTER_TYPE_SINGLE_CONTACT) {
@@ -387,8 +388,8 @@ public abstract class ContactBrowseListFragment extends 
            }

        }



        // Display the user's profile.

        adapter.setIncludeProfile(true);

        // Display the user's profile if not in search mode

        adapter.setIncludeProfile(!searchMode);

    }



    @Override

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

+2 −1
Original line number Diff line number Diff line
@@ -196,7 +196,8 @@ public class DefaultContactListAdapter extends ContactListAdapter { 
                                + "SELECT DISTINCT " + RawContacts.CONTACT_ID

                                + " FROM raw_contacts"

                                + " WHERE " + RawContacts.ACCOUNT_TYPE + "=?"

                                + "   AND " + RawContacts.ACCOUNT_NAME + "=?");

                                + " AND " + RawContacts.ACCOUNT_NAME + "=?"

                                + " OR " + Contacts.IS_USER_PROFILE + "=1");

                selectionArgs.add(filter.accountType);

                selectionArgs.add(filter.accountName);

                if (filter.dataSet != null) {