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

Commit b0b3db75 authored by Josh Gargus's avatar Josh Gargus
Browse files

Fix appearance of Dialtacts search headers. 

Bug: 6117164
Change-Id: I2ccae66a77031bd1a36a5997ad849af984379471
parent 78eefb87

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

+9 −1
Original line number Diff line number Diff line
@@ -86,9 +86,17 @@ public abstract class ContactEntryListAdapter extends IndexerListAdapter { 
    private String mContactsCount = "";

    private boolean mDarkTheme = false;



    /** Resource used to provide header-text for default filter. */

    private CharSequence mDefaultFilterHeaderText;



    public ContactEntryListAdapter(Context context) {

        super(context);

        addPartitions();

        setDefaultFilterHeaderText(R.string.local_search_label);

    }



    protected void setDefaultFilterHeaderText(int resourceId) {

        mDefaultFilterHeaderText = getContext().getResources().getText(resourceId);

    }



    @Override
@@ -532,7 +540,7 @@ public abstract class ContactEntryListAdapter extends IndexerListAdapter { 
        TextView labelTextView = (TextView)view.findViewById(R.id.label);

        TextView displayNameTextView = (TextView)view.findViewById(R.id.display_name);

        if (directoryId == Directory.DEFAULT || directoryId == Directory.LOCAL_INVISIBLE) {

            labelTextView.setText(R.string.local_search_label);

            labelTextView.setText(mDefaultFilterHeaderText);

            displayNameTextView.setText(null);

        } else {

            labelTextView.setText(R.string.directory_search_label);

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

+3 −2
Original line number Diff line number Diff line
@@ -29,12 +29,13 @@ import android.provider.ContactsContract.ContactCounts; 
import android.provider.ContactsContract.Contacts;

import android.provider.ContactsContract.Data;

import android.provider.ContactsContract.Directory;

import android.provider.ContactsContract.RawContacts;

import android.text.TextUtils;

import android.util.Log;

import android.view.View;

import android.view.ViewGroup;



import com.android.contacts.R;



import java.util.ArrayList;

import java.util.List;
@@ -90,7 +91,7 @@ public class PhoneNumberListAdapter extends ContactEntryListAdapter { 


    public PhoneNumberListAdapter(Context context) {

        super(context);



        setDefaultFilterHeaderText(R.string.list_filter_phones);

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

    }

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

+4 −2
Original line number Diff line number Diff line
@@ -116,7 +116,9 @@ public class PhoneNumberPickerFragment extends ContactEntryListFragment<ContactE 
        if (mAccountFilterHeader == null || filter == null) {

            return;

        }

        final boolean shouldShowHeader = AccountFilterUtil.updateAccountFilterTitleForPhone(

        final boolean shouldShowHeader =

                !isSearchMode() &&

                AccountFilterUtil.updateAccountFilterTitleForPhone(

                        mAccountFilterHeader, filter, false);

        if (shouldShowHeader) {

            mPaddingView.setVisibility(View.GONE);