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

Commit 82ddd260 authored by Daniel Lehmann's avatar Daniel Lehmann Committed by Android (Google) Code Review
Browse files

Merge "Disable search in legacy pickers for phone and contact" into ics-mr1

parents 6b02c262 d1af8adb

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -153,8 +153,10 @@ public class ContactSelectionActivity extends ContactsActivity 
    }

    }





    private void prepareSearchViewAndActionBar() {

    private void prepareSearchViewAndActionBar() {

        // Postal address picker doesn't support search, so just show "HomeAsUp" button and title.

        // Postal address pickers (and legacy pickers) don't support search, so just show

        if (mRequest.getActionCode() == ContactsRequest.ACTION_PICK_POSTAL) {

        // "HomeAsUp" button and title.

        if (mRequest.getActionCode() == ContactsRequest.ACTION_PICK_POSTAL ||

                mRequest.isLegacyCompatibilityMode()) {

            findViewById(R.id.search_view).setVisibility(View.GONE);

            findViewById(R.id.search_view).setVisibility(View.GONE);

            final ActionBar actionBar = getActionBar();

            final ActionBar actionBar = getActionBar();

            if (actionBar != null) {

            if (actionBar != null) {

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,6 @@ public class PhoneNumberPickerFragment extends ContactEntryListFragment<ContactE 
    public PhoneNumberPickerFragment() {

    public PhoneNumberPickerFragment() {

        setQuickContactEnabled(false);

        setQuickContactEnabled(false);

        setPhotoLoaderEnabled(true);

        setPhotoLoaderEnabled(true);

        setVisibleScrollbarEnabled(true);

        setSectionHeaderDisplayEnabled(true);

        setSectionHeaderDisplayEnabled(true);

        setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_DATA_SHORTCUT);

        setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_DATA_SHORTCUT);
@@ -93,6 +92,8 @@ public class PhoneNumberPickerFragment extends ContactEntryListFragment<ContactE 
        mAccountFilterHeader = getView().findViewById(R.id.account_filter_header_container);

        mAccountFilterHeader = getView().findViewById(R.id.account_filter_header_container);

        mAccountFilterHeader.setOnClickListener(mFilterHeaderClickListener);

        mAccountFilterHeader.setOnClickListener(mFilterHeaderClickListener);

        updateFilterHeaderView();

        updateFilterHeaderView();



        setVisibleScrollbarEnabled(!isLegacyCompatibilityMode());

    }

    }





    @Override

    @Override