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

Commit d6000a8e authored by Chiao Cheng's avatar Chiao Cheng Committed by Android (Google) Code Review
Browse files

Merge "Prefactor to remove un-used ContextMenuAdapter."

parents 9e347c94 0ef9a729

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

+0 −10
Original line number Diff line number Diff line
@@ -526,16 +526,6 @@ public class ContactSelectionActivity extends ContactsActivity 
        finish();

    }



    @Override

    public boolean onContextItemSelected(MenuItem item) {

        ContextMenuAdapter menuAdapter = mListFragment.getContextMenuAdapter();

        if (menuAdapter != null) {

            return menuAdapter.onContextItemSelected(item);

        }



        return super.onContextItemSelected(item);

    }



    @Override

    public boolean onQueryTextChange(String newText) {

        mListFragment.setQueryString(newText, true);

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

+0 −17
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ import com.android.contacts.common.list.ContactEntryListAdapter; 
import com.android.contacts.common.list.DirectoryListLoader;

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

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

import com.android.contacts.widget.ContextMenuAdapter;



/**

 * Common base class for various contact-related list fragments.
@@ -128,7 +127,6 @@ public abstract class ContactEntryListFragment<T extends ContactEntryListAdapter 
    private int mSortOrder;

    private int mDirectoryResultLimit = DEFAULT_DIRECTORY_RESULT_LIMIT;



    private ContextMenuAdapter mContextMenuAdapter;

    private ContactPhotoManager mPhotoManager;

    private ContactListEmptyView mEmptyView;

    private ContactsPreferences mContactsPrefs;
@@ -692,17 +690,6 @@ public abstract class ContactEntryListFragment<T extends ContactEntryListAdapter 
        mDirectoryResultLimit = limit;

    }



    public void setContextMenuAdapter(ContextMenuAdapter adapter) {

        mContextMenuAdapter = adapter;

        if (mListView != null) {

            mListView.setOnCreateContextMenuListener(adapter);

        }

    }



    public ContextMenuAdapter getContextMenuAdapter() {

        return mContextMenuAdapter;

    }



    protected boolean loadPreferences() {

        boolean changed = false;

        if (getContactNameDisplayOrder() != mContactsPrefs.getDisplayOrder()) {
@@ -769,10 +756,6 @@ public abstract class ContactEntryListFragment<T extends ContactEntryListAdapter 
        // We manually save/restore the listview state

        mListView.setSaveEnabled(false);



        if (mContextMenuAdapter != null) {

            mListView.setOnCreateContextMenuListener(mContextMenuAdapter);

        }



        configureVerticalScrollbar();

        configurePhotoLoader();

    }