commit 495db43f0a08bd71ba28a42f89b80d38af15afec
author Katherine Kuan <katherinekuan@google.com> Wed Jul 06 18:58:46 2011 -0700
committer Katherine Kuan <katherinekuan@google.com> Sat Jul 09 12:24:12 2011 -0700
tree 59aa28d58cce67caf063b0085fb271409e8994e6
parent fdf5d84cc1260b116c14c94bec27f949edb06ef6

Bring back account filter

- ContactListFilterController no longer loads accounts and groups,
to display in the action bar drop down menu. Now it just stores
current filter and saves it to preferences.
- ContactListFilterLoader is no longer needed because we're not
loading groups anymore
- Move adapter from ContactListFilterController to the
AccountFilterActivity
- AccountFilterActivity loads a list of accounts and returns
a ContactListFilter as an activity result based on the account
selected
- If "customize" is selected, then the CustomContactListFilterActivity
will be launched.
- Show header in contacts list according to what account filter
was selected
- Update filter activities to holo theme

- TODO: Remove the "display phones only" option in the
customize menu on the phone

Change-Id: I45e0bdee80e7885d39bf09183a66ec50d81d1982

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 821e5f8..a25b73d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -366,6 +366,9 @@
     <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when a group or account is selected  [CHAR LIMIT=64]-->
     <string name="listTotalAllContactsZeroGroup">No contacts in <xliff:g id="name" example="Friends">%s</xliff:g></string>
 
+    <!-- Displayed at the top of the contacts showing the account filter selected  [CHAR LIMIT=64] -->
+    <string name="listAllContactsInAccount">Contacts in <xliff:g id="name" example="abc@gmail.com">%s</xliff:g></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>
@@ -1490,6 +1493,9 @@
     <!-- Title of the settings activity [CHAR LIMIT=64] -->
     <string name="activity_title_settings">Settings</string>
 
+    <!-- Title of the activity that allows the uesr to filter the list of contacts displayed according to account [CHAR LIMIT=25] -->
+    <string name="activity_title_contacts_filter">Contacts to display</string>
+
     <!-- Menu item for the settings activity [CHAR LIMIT=64] -->
     <string name="menu_settings">Settings</string>
 

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 067a730..914532c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -227,7 +227,7 @@
     <style name="ContactsPreferencesTheme" parent="@android:Theme.Holo.Light">
     </style>
 
-    <style name="CustomContactListFilterTheme" parent="@android:Theme">
+    <style name="ContactListFilterTheme" parent="@android:Theme.Holo.Light">
     </style>
 
     <style name="ContactPickerLayout" parent="ContactPickerTheme">
@@ -235,7 +235,7 @@
         <item name="android:layout_height">match_parent</item>
     </style>
 
-    <style name="CustomContactListFilterView" parent="CustomContactListFilterTheme">
+    <style name="CustomContactListFilterView" parent="ContactListFilterTheme">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
     </style>