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

Commit d1af8adb authored by Daniel Lehmann's avatar Daniel Lehmann
Browse files

Disable search in legacy pickers for phone and contact 

 - Also fixes the scrollbar in the phone legacy picker

Bug:5570791

Change-Id: I983fe441f455906cf2f610c8209d72c90a720f1b
parent 183c6fec

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

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



    private void prepareSearchViewAndActionBar() {

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

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

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

        // "HomeAsUp" button and title.

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

                mRequest.isLegacyCompatibilityMode()) {

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

            final ActionBar actionBar = getActionBar();

            if (actionBar != null) {

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

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

        setQuickContactEnabled(false);

        setPhotoLoaderEnabled(true);

        setVisibleScrollbarEnabled(true);

        setSectionHeaderDisplayEnabled(true);

        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.setOnClickListener(mFilterHeaderClickListener);

        updateFilterHeaderView();



        setVisibleScrollbarEnabled(!isLegacyCompatibilityMode());

    }



    @Override