Merge "Remove AccountFilterActivity and its usage (ContactsCommon)"
diff --git a/res-common/drawable-hdpi/ic_menu_settings_holo_light.png b/res-common/drawable-hdpi/ic_menu_settings_holo_light.png
deleted file mode 100644
index b7bb5c4..0000000
--- a/res-common/drawable-hdpi/ic_menu_settings_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-hdpi/unknown_source.png b/res-common/drawable-hdpi/unknown_source.png
deleted file mode 100644
index 0a8f37d..0000000
--- a/res-common/drawable-hdpi/unknown_source.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-ldrtl-hdpi/ic_menu_settings_holo_light.png b/res-common/drawable-ldrtl-hdpi/ic_menu_settings_holo_light.png
deleted file mode 100644
index c3d86ca..0000000
--- a/res-common/drawable-ldrtl-hdpi/ic_menu_settings_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-ldrtl-mdpi/ic_menu_settings_holo_light.png b/res-common/drawable-ldrtl-mdpi/ic_menu_settings_holo_light.png
deleted file mode 100644
index ac172b2..0000000
--- a/res-common/drawable-ldrtl-mdpi/ic_menu_settings_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-ldrtl-xhdpi/ic_menu_settings_holo_light.png b/res-common/drawable-ldrtl-xhdpi/ic_menu_settings_holo_light.png
deleted file mode 100644
index d3a334a..0000000
--- a/res-common/drawable-ldrtl-xhdpi/ic_menu_settings_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-mdpi/ic_menu_settings_holo_light.png b/res-common/drawable-mdpi/ic_menu_settings_holo_light.png
deleted file mode 100644
index 1ebc112..0000000
--- a/res-common/drawable-mdpi/ic_menu_settings_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-mdpi/ic_menu_star_holo_light.png b/res-common/drawable-mdpi/ic_menu_star_holo_light.png
deleted file mode 100644
index 8263b27..0000000
--- a/res-common/drawable-mdpi/ic_menu_star_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-mdpi/unknown_source.png b/res-common/drawable-mdpi/unknown_source.png
deleted file mode 100644
index 356748f..0000000
--- a/res-common/drawable-mdpi/unknown_source.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-xhdpi/ic_menu_settings_holo_light.png b/res-common/drawable-xhdpi/ic_menu_settings_holo_light.png
deleted file mode 100644
index 68ba92b..0000000
--- a/res-common/drawable-xhdpi/ic_menu_settings_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-xhdpi/unknown_source.png b/res-common/drawable-xhdpi/unknown_source.png
deleted file mode 100644
index 35e8fb4..0000000
--- a/res-common/drawable-xhdpi/unknown_source.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-xxhdpi/ic_menu_settings_holo_light.png b/res-common/drawable-xxhdpi/ic_menu_settings_holo_light.png
deleted file mode 100644
index 5b672a3..0000000
--- a/res-common/drawable-xxhdpi/ic_menu_settings_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res-common/layout/contact_list_filter.xml b/res-common/layout/contact_list_filter.xml
deleted file mode 100644
index d419c7e..0000000
--- a/res-common/layout/contact_list_filter.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2011 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:fillViewport="true">
-
- <ListView
- android:id="@android:id/list"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:layout_marginLeft="@dimen/contact_filter_left_margin"
- android:layout_marginRight="@dimen/contact_filter_right_margin"
- android:layout_marginStart="@dimen/contact_filter_left_margin"
- android:layout_marginEnd="@dimen/contact_filter_right_margin" />
-
- <View
- android:layout_width="match_parent"
- android:layout_height="1dip"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:layout_marginStart="16dip"
- android:layout_marginEnd="16dip"
- android:background="?android:attr/dividerHorizontal" />
-</LinearLayout>
diff --git a/res-common/layout/contact_list_filter_custom.xml b/res-common/layout/contact_list_filter_custom.xml
deleted file mode 100644
index b6d9229..0000000
--- a/res-common/layout/contact_list_filter_custom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/CustomContactListFilterView"
- android:orientation="vertical"
- android:fillViewport="true">
-
- <ExpandableListView
- android:id="@android:id/list"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:layout_marginLeft="@dimen/contact_filter_left_margin"
- android:layout_marginRight="@dimen/contact_filter_right_margin"
- android:layout_marginStart="@dimen/contact_filter_left_margin"
- android:layout_marginEnd="@dimen/contact_filter_right_margin"
- android:overScrollMode="always" />
-
- <View
- android:layout_width="match_parent"
- android:layout_height="1dip"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:layout_marginStart="16dip"
- android:layout_marginEnd="16dip"
- android:background="?android:attr/dividerHorizontal" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- style="?android:attr/buttonBarStyle">
-
- <Button
- android:id="@+id/btn_discard"
- style="?android:attr/buttonBarButtonStyle"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@android:string/cancel" />
-
- <Button
- android:id="@+id/btn_done"
- style="?android:attr/buttonBarButtonStyle"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@android:string/ok" />
-
- </LinearLayout>
-</LinearLayout>
diff --git a/res-common/layout/contact_list_filter_item.xml b/res-common/layout/contact_list_filter_item.xml
deleted file mode 100644
index 09bbe55..0000000
--- a/res-common/layout/contact_list_filter_item.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<view
- xmlns:android="http://schemas.android.com/apk/res/android"
- class="com.android.contacts.common.list.ContactListFilterView"
- android:descendantFocusability="blocksDescendants"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="@dimen/contact_filter_item_min_height"
- android:gravity="center_vertical">
-
- <ImageView
- android:id="@+id/icon"
- android:scaleType="fitCenter"
- android:layout_width="@dimen/contact_filter_icon_size"
- android:layout_height="@dimen/contact_filter_icon_size"/>
-
- <LinearLayout
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="vertical"
- android:layout_marginLeft="8dip"
- android:layout_marginStart="8dip">
-
- <TextView
- android:id="@+id/accountType"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:singleLine="true"
- android:ellipsize="end"/>
-
- <TextView
- android:id="@+id/accountUserName"
- android:layout_marginTop="-3dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorTertiary"
- android:singleLine="true"
- android:ellipsize="end"/>
- </LinearLayout>
-
- <RadioButton
- android:id="@+id/radioButton"
- android:clickable="false"
- android:layout_marginTop="1dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="end|center_vertical" />
-</view>
-
diff --git a/res-common/layout/custom_contact_list_filter_account.xml b/res-common/layout/custom_contact_list_filter_account.xml
deleted file mode 100644
index b1f3f2b..0000000
--- a/res-common/layout/custom_contact_list_filter_account.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:gravity="center_vertical"
- android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft"
- android:paddingRight="?android:attr/scrollbarSize"
- android:paddingStart="?android:attr/expandableListPreferredItemPaddingLeft"
- android:paddingEnd="?android:attr/scrollbarSize">
-
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="6dip"
- android:layout_marginEnd="6dip"
- android:layout_marginTop="6dip"
- android:layout_marginBottom="6dip"
- android:layout_weight="1"
- android:duplicateParentState="true">
-
- <TextView
- android:id="@android:id/text1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:duplicateParentState="true" />
-
- <TextView
- android:id="@android:id/text2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@android:id/text1"
- android:layout_alignLeft="@android:id/text1"
- android:layout_alignStart="@android:id/text1"
- android:maxLines="1"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorTertiary"
- android:duplicateParentState="true" />
-
- </RelativeLayout>
-
-</LinearLayout>
diff --git a/res-common/layout/custom_contact_list_filter_group.xml b/res-common/layout/custom_contact_list_filter_group.xml
deleted file mode 100644
index bd8c604..0000000
--- a/res-common/layout/custom_contact_list_filter_group.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:gravity="center_vertical"
- android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft"
- android:paddingRight="?android:attr/scrollbarSize"
- android:paddingStart="?android:attr/expandableListPreferredItemPaddingLeft"
- android:paddingEnd="?android:attr/scrollbarSize"
->
-
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="6dip"
- android:layout_marginEnd="6dip"
- android:layout_marginTop="6dip"
- android:layout_marginBottom="6dip"
- android:layout_weight="1"
- android:duplicateParentState="true"
- >
-
- <TextView
- android:id="@android:id/text1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:duplicateParentState="true"
- />
-
- <TextView
- android:id="@android:id/text2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@android:id/text1"
- android:layout_alignLeft="@android:id/text1"
- android:layout_alignStart="@android:id/text1"
- android:maxLines="2"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:duplicateParentState="true"
- />
-
- </RelativeLayout>
-
- <CheckBox
- android:id="@android:id/checkbox"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="4dip"
- android:layout_marginEnd="4dip"
- android:focusable="false"
- android:clickable="false"
- android:gravity="center_vertical"
- android:orientation="vertical"
- android:duplicateParentState="true"
- />
-
-</LinearLayout>
diff --git a/res-common/values-sw600dp/styles.xml b/res-common/values-sw600dp/styles.xml
deleted file mode 100644
index 2130ce1..0000000
--- a/res-common/values-sw600dp/styles.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- ~ Copyright (C) 2012 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<resources>
- <style name="ContactListFilterTheme" parent="@android:Theme.Holo.Light.Dialog">
- <item name="android:windowCloseOnTouchOutside">true</item>
- <item name="android:listViewStyle">@style/ListViewStyle</item>
- </style>
-
- <style name="CustomContactListFilterView" parent="ContactListFilterTheme">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">400dip</item>
- </style>
-
-</resources>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 0cbc1f8..6afeaac 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -43,12 +43,6 @@
-->
<dimen name="contact_tile_shadowbox_height">48sp</dimen>
- <!-- For contact filter setting screens -->
- <dimen name="contact_filter_left_margin">16dip</dimen>
- <dimen name="contact_filter_right_margin">16dip</dimen>
- <dimen name="contact_filter_item_min_height">48dip</dimen>
- <dimen name="contact_filter_icon_size">32dip</dimen>
-
<!-- Padding to be used between a visible scrollbar and the contact list -->
<dimen name="list_visible_scrollbar_padding">32dip</dimen>
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index 95a1ec1..d1f37b4 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -380,33 +380,6 @@
<!-- Contact list filter label indicating that the list is showing all available accounts [CHAR LIMIT=64] -->
<string name="list_filter_all_accounts">All contacts</string>
- <!-- Contact list filter label indicating that the list is showing all starred contacts [CHAR LIMIT=64] -->
- <string name="list_filter_all_starred">Starred</string>
-
- <!-- Contact list filter selection indicating that the list shows groups chosen by the user [CHAR LIMIT=64] -->
- <string name="list_filter_customize">Customize</string>
-
- <!-- Contact list filter selection indicating that the list shows only the selected contact [CHAR LIMIT=64] -->
- <string name="list_filter_single">Contact</string>
-
- <!-- List title for a special contacts group that covers all contacts. [CHAR LIMIT=25] -->
- <string name="display_ungrouped">All other contacts</string>
-
- <!-- List title for a special contacts group that covers all contacts that
-a ren't members of any other group. [CHAR LIMIT=25] -->
- <string name="display_all_contacts">All contacts</string>
-
- <string name="menu_sync_remove">Remove sync group</string>
- <string name="dialog_sync_add">Add sync group</string>
- <string name="display_more_groups">More groups\u2026</string>
-
- <!-- Warning message given to users just before they remove a currently syncing
- group that would also cause all ungrouped contacts to stop syncing. [CHAR LIMIT=NONE] -->
- <string name="display_warn_remove_ungrouped">Removing \"<xliff:g id="group" example="Starred">%s</xliff:g>\" from sync will also remove any ungrouped contacts from sync.</string>
-
- <!-- Displayed in a spinner dialog as user changes to display options are saved -->
- <string name="savingDisplayGroups">Saving display options\u2026</string>
-
<!-- Menu item to indicate you are done editing a contact and want to save the changes you've made -->
<string name="menu_done">Done</string>
@@ -701,15 +674,6 @@
<!-- Menu item to search contacts -->
<string name="menu_search">Search</string>
- <!-- The menu item to filter the list of contacts displayed -->
- <string name="menu_contacts_filter">Contacts to display</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>
-
- <!-- Title of the activity that allows the user to customize filtering of contact list [CHAR LIMIT=128] -->
- <string name="custom_list_filter">Define custom view</string>
-
<!-- Query hint displayed inside the search field [CHAR LIMIT=64] -->
<string name="hint_findContacts">Find contacts</string>
@@ -828,14 +792,6 @@
<!-- Toast message showing when failed to open the url. [CHAR LIMIT=100]-->
<string name="url_open_error_toast">Failed to open the url.</string>
- <!-- Content description of entries (including that radio button is checked) in contact
- accounts list filter. For example: Google abc@gmail.com checked, etc [CHAR LIMIT=30]-->
- <string name="account_filter_view_checked"><xliff:g id="account_info">%s</xliff:g> checked</string>
-
- <!-- Content description of entries (including that the radio button is not checked) in contact
- accounts list filter. For example: Google abc@gmail.com not checked, etc [CHAR LIMIT=30]-->
- <string name="account_filter_view_not_checked"><xliff:g id="account_info">%s</xliff:g> not checked</string>
-
<!-- Description string for an action button to initiate a video call from search results.
Note: AccessibilityServices use this attribute to announce what the view represents.
This is especially valuable for views without textual representation like ImageView.
diff --git a/res-common/values/styles.xml b/res-common/values/styles.xml
index 77c4677..81943ce 100644
--- a/res-common/values/styles.xml
+++ b/res-common/values/styles.xml
@@ -69,15 +69,6 @@
<item name="android:overScrollMode">always</item>
</style>
- <style name="ContactListFilterTheme" parent="@android:Theme.Holo.Light">
- <item name="android:listViewStyle">@style/ListViewStyle</item>
- </style>
-
- <style name="CustomContactListFilterView" parent="ContactListFilterTheme">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">match_parent</item>
- </style>
-
<style name="BackgroundOnlyTheme" parent="@android:style/Theme.Material.Light">
<item name="android:windowBackground">@null</item>
<item name="android:windowContentOverlay">@null</item>
