commit d41284e7b5c4864446be3e8279db34d70ece0b77
author Katherine Kuan <katherinekuan@google.com> Fri Aug 26 16:48:55 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 26 16:48:55 2011 -0700
tree c9fe0b9d0464bdcace7bd591000831c09a960d1d
parent eb2508523463c74544215b2308f577a9b19b622d
parent 00eaf3749e4382320aada2299b01567c9a4e9a2a

Merge "Add "Contacts in custom view" string for custom account filter"

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 113df61..102ddbd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -363,6 +363,9 @@
     <!-- Displayed at the top of the contacts showing single contact. [CHAR LIMIT=64] -->
     <string name="listSingleContact">Single contact</string>
 
+    <!-- Displayed at the top of the contacts showing single contact. [CHAR LIMIT=64] -->
+    <string name="listCustomView">Contacts in custom view</string>
+
     <!-- Displayed at the top of the contacts showing the total number of contacts found when "Only contacts with phones" not selected -->
     <plurals name="listFoundAllContacts">
         <item quantity="one">1 found</item>

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

diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 123ef0e..306e244 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -130,17 +130,20 @@
                 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

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

diff --git a/src/com/android/contacts/list/PhoneNumberPickerFragment.java b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
index 2798905..4819ded 100644
--- a/src/com/android/contacts/list/PhoneNumberPickerFragment.java
+++ b/src/com/android/contacts/list/PhoneNumberPickerFragment.java
@@ -94,17 +94,29 @@
     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);
         }
     }