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

Commit e9ea4f0f authored by Walter Jang's avatar Walter Jang
Browse files

Move MultiSelect classes up the list hierarchies (1/2) 

And have the GroupMembersListFragment extend the
MultiSelectContactsListFragment

Bug 18641067

Change-Id: I6773c4da89c744af8301b65f822cda07a18010de
parent 9c1fa5db

src/com/android/contacts/activities/PeopleActivity.java

+4 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ import com.android.contacts.interactions.ContactMultiDeletionInteraction.MultiCo 
import com.android.contacts.list.ContactsIntentResolver;

import com.android.contacts.list.ContactsRequest;

import com.android.contacts.list.ContactsUnavailableFragment;

import com.android.contacts.list.MultiSelectContactsListFragment;

import com.android.contacts.list.DefaultContactBrowseListFragment;

import com.android.contacts.list.MultiSelectContactsListFragment.OnCheckBoxListActionListener;

import com.android.contacts.list.OnContactBrowserActionListener;

import com.android.contacts.list.OnContactsUnavailableActionListener;
@@ -149,7 +149,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements 
    /**

     * Showing a list of Contacts. Also used for showing search results in search mode.

     */

    private MultiSelectContactsListFragment mAllFragment;

    private DefaultContactBrowseListFragment mAllFragment;

    private GroupsFragment mGroupsFragment;

    private AccountFiltersFragment mAccountFiltersFragment;
@@ -375,7 +375,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements 
        // However, if it's after screen rotation, the fragments have been re-created by

        // the fragment manager, so first see if there're already the target fragments

        // existing.

        mAllFragment = (MultiSelectContactsListFragment)

        mAllFragment = (DefaultContactBrowseListFragment)

                fragmentManager.findFragmentByTag(ALL_TAG);

        mGroupsFragment = (GroupsFragment)

                fragmentManager.findFragmentByTag(GROUPS_TAG);
@@ -383,7 +383,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements 
                fragmentManager.findFragmentByTag(FILTERS_TAG);



        if (mAllFragment == null) {

            mAllFragment = new MultiSelectContactsListFragment();

            mAllFragment = new DefaultContactBrowseListFragment();

            transaction.add(R.id.tab_pager, mAllFragment, ALL_TAG);



            if (areGroupWritableAccountsAvailable()) {

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

+3 −3
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ import android.view.View; 
import android.view.ViewGroup;



import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;

import com.android.contacts.common.list.ContactEntryListAdapter;

import com.android.contacts.common.list.ContactListItemView;

import com.android.contacts.common.list.MultiSelectEntryContactListAdapter;

import com.android.contacts.common.preference.ContactsPreferences;



/** Group members cursor adapter. */

public class GroupMembersListAdapter extends ContactEntryListAdapter {

public class GroupMembersListAdapter extends MultiSelectEntryContactListAdapter {



    private static class GroupMembersQuery {
@@ -67,7 +67,7 @@ public class GroupMembersListAdapter extends ContactEntryListAdapter { 
    private long mGroupId;



    public GroupMembersListAdapter(Context context) {

        super(context);

        super(context, GroupMembersQuery.CONTACT_ID);

        mUnknownNameText = context.getText(android.R.string.unknownName);

        setIndexedPartition(0);

    }

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

+7 −1
Original line number Diff line number Diff line
@@ -41,9 +41,10 @@ import com.android.contacts.common.list.ContactEntryListFragment; 
import com.android.contacts.common.model.AccountTypeManager;

import com.android.contacts.common.model.account.AccountType;

import com.android.contacts.interactions.GroupDeletionDialogFragment;

import com.android.contacts.list.MultiSelectContactsListFragment;



/** Displays the members of a group. */

public class GroupMembersListFragment extends ContactEntryListFragment<GroupMembersListAdapter> {

public class GroupMembersListFragment extends MultiSelectContactsListFragment {



    private static final String TAG = "GroupMembersList";
@@ -347,6 +348,11 @@ public class GroupMembersListFragment extends ContactEntryListFragment<GroupMemb 
        return adapter;

    }



    @Override

    public GroupMembersListAdapter getAdapter() {

        return (GroupMembersListAdapter) super.getAdapter();

    }



    @Override

    protected void configureAdapter() {

        super.configureAdapter();

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

+6 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.util.Log; 


import com.android.common.widget.CompositeCursorAdapter.Partition;

import com.android.contacts.common.list.AutoScrollListView;

import com.android.contacts.common.list.ContactEntryListFragment;

import com.android.contacts.common.list.ContactListAdapter;

import com.android.contacts.common.list.ContactListFilter;

import com.android.contacts.common.list.DirectoryPartition;
@@ -49,7 +48,7 @@ import java.util.List; 
 * picking a contact with one of the PICK intents).

 */

public abstract class ContactBrowseListFragment extends

        ContactEntryListFragment<ContactListAdapter> {

        MultiSelectContactsListFragment<ContactListAdapter> {



    private static final String TAG = "ContactList";
@@ -382,6 +381,11 @@ public abstract class ContactBrowseListFragment extends 
        }

    }



    @Override

    public ContactListAdapter getAdapter() {

        return (ContactListAdapter) super.getAdapter();

    }



    @Override

    protected void configureAdapter() {

        super.configureAdapter();

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

+5 −1
Original line number Diff line number Diff line
@@ -63,6 +63,10 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment 
        if (uri == null) {

            return;

        }

        if (getAdapter().isDisplayingCheckBoxes()) {

            super.onItemClick(position, id);

            return;

        }

        viewContact(uri, getAdapter().isEnterpriseContact(position));

    }