diff options
| author | Katherine Kuan <katherinekuan@google.com> | 2011-08-26 16:48:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-26 16:48:55 -0700 |
| commit | d41284e7b5c4864446be3e8279db34d70ece0b77 (patch) | |
| tree | c9fe0b9d0464bdcace7bd591000831c09a960d1d /src | |
| parent | eb2508523463c74544215b2308f577a9b19b622d (diff) | |
| parent | 00eaf3749e4382320aada2299b01567c9a4e9a2a (diff) | |
| download | packages_apps_Contacts-d41284e7b5c4864446be3e8279db34d70ece0b77.tar.gz packages_apps_Contacts-d41284e7b5c4864446be3e8279db34d70ece0b77.tar.bz2 packages_apps_Contacts-d41284e7b5c4864446be3e8279db34d70ece0b77.zip | |
Merge "Add "Contacts in custom view" string for custom account filter"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/contacts/list/DefaultContactBrowseListFragment.java | 15 | ||||
| -rw-r--r-- | src/com/android/contacts/list/PhoneNumberPickerFragment.java | 32 |
2 files changed, 31 insertions, 16 deletions
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java index 123ef0e0d..306e24441 100644 --- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java +++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java @@ -130,17 +130,20 @@ public class DefaultContactBrowseListFragment extends ContactBrowseListFragment mAccountFilterHeaderContainer.setVisibility(View.VISIBLE); mAccountFilterHeaderView.setText(getContext().getString( R.string.listSingleContact)); - } else if (filter.filterType != ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS - && filter.filterType != ContactListFilter.FILTER_TYPE_CUSTOM) { + return; + } else if (filter.filterType == ContactListFilter.FILTER_TYPE_CUSTOM) { + mAccountFilterHeaderContainer.setVisibility(View.VISIBLE); + mAccountFilterHeaderView.setText(getContext().getString( + R.string.listCustomView)); + return; + } else if (filter.filterType != ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS) { mAccountFilterHeaderContainer.setVisibility(View.VISIBLE); mAccountFilterHeaderView.setText(getContext().getString( R.string.listAllContactsInAccount, filter.accountName)); - } else { - mAccountFilterHeaderContainer.setVisibility(View.GONE); + return; } - } else { - mAccountFilterHeaderContainer.setVisibility(View.GONE); } + mAccountFilterHeaderContainer.setVisibility(View.GONE); } @Override diff --git a/src/com/android/contacts/list/PhoneNumberPickerFragment.java b/src/com/android/contacts/list/PhoneNumberPickerFragment.java index 27989051d..4819dedfe 100644 --- a/src/com/android/contacts/list/PhoneNumberPickerFragment.java +++ b/src/com/android/contacts/list/PhoneNumberPickerFragment.java @@ -94,17 +94,29 @@ public class PhoneNumberPickerFragment extends ContactEntryListFragment<ContactE private void updateFilterHeaderView() { if (mAccountFilterHeaderView != null) { ContactListFilter filter = getFilter(); - if (filter != null - && !isSearchMode() - && filter.filterType == ContactListFilter.FILTER_TYPE_ACCOUNT) { - mAccountFilterHeaderContainer.setVisibility(View.VISIBLE); - mAccountFilterHeaderView.setText(getContext().getString( - R.string.listAllContactsInAccount, filter.accountName)); - mPaddingView.setVisibility(View.GONE); - } else { - mAccountFilterHeaderContainer.setVisibility(View.GONE); - mPaddingView.setVisibility(View.VISIBLE); + if (filter != null && !isSearchMode()) { + if (filter.filterType == ContactListFilter.FILTER_TYPE_SINGLE_CONTACT) { + mAccountFilterHeaderContainer.setVisibility(View.VISIBLE); + mAccountFilterHeaderView.setText(getContext().getString( + R.string.listSingleContact)); + mPaddingView.setVisibility(View.GONE); + return; + } else if (filter.filterType == ContactListFilter.FILTER_TYPE_CUSTOM) { + mAccountFilterHeaderContainer.setVisibility(View.VISIBLE); + mAccountFilterHeaderView.setText(getContext().getString( + R.string.listCustomView)); + mPaddingView.setVisibility(View.GONE); + return; + } else if (filter.filterType != ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS) { + mAccountFilterHeaderContainer.setVisibility(View.VISIBLE); + mAccountFilterHeaderView.setText(getContext().getString( + R.string.listAllContactsInAccount, filter.accountName)); + mPaddingView.setVisibility(View.GONE); + return; + } } + mAccountFilterHeaderContainer.setVisibility(View.GONE); + mPaddingView.setVisibility(View.VISIBLE); } } |