Major resource move and clean-up.
Moving resources from Contacts to ContactsCommon and Dialer as necessary to
remove dialer dependencies on contacts app.
Bug: 6993891
Change-Id: I43524e95efa0948935ccbc29c12c100f336b69fb
diff --git a/res/color/dialer_button_text.xml b/res/color/dialer_button_text.xml
deleted file mode 100644
index 585906e..0000000
--- a/res/color/dialer_button_text.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:state_pressed="true" android:color="#000"/>
- <item android:state_focused="true" android:color="#FFF"/>
- <item android:color="#FFF"/> <!-- not selected -->
-
-</selector>
-
diff --git a/res/color/secondary_text_color.xml b/res/color/secondary_text_color.xml
deleted file mode 100644
index 1c62458..0000000
--- a/res/color/secondary_text_color.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:state_activated="true" android:color="#FFFFFF" />
- <item android:color="#777777" /> <!-- not selected -->
-
-</selector>
diff --git a/res/drawable-hdpi/ic_ab_history_holo_dark.png b/res/drawable-hdpi/ic_ab_history_holo_dark.png
deleted file mode 100644
index 1edab8d..0000000
--- a/res/drawable-hdpi/ic_ab_history_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_add_contact_holo_dark.png b/res/drawable-hdpi/ic_add_contact_holo_dark.png
deleted file mode 100644
index 88ff33b..0000000
--- a/res/drawable-hdpi/ic_add_contact_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_dial_action_search.png b/res/drawable-hdpi/ic_dial_action_search.png
deleted file mode 100644
index 898ce11..0000000
--- a/res/drawable-hdpi/ic_dial_action_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_overflow.png b/res/drawable-hdpi/ic_menu_overflow.png
deleted file mode 100644
index a12aedf..0000000
--- a/res/drawable-hdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_minus_disabled_holo_dark.png b/res/drawable-hdpi/ic_minus_disabled_holo_dark.png
deleted file mode 100644
index c2ad8dc..0000000
--- a/res/drawable-hdpi/ic_minus_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_minus_holo_dark.png b/res/drawable-hdpi/ic_minus_holo_dark.png
deleted file mode 100644
index f228047..0000000
--- a/res/drawable-hdpi/ic_minus_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_plus_disabled_holo_dark.png b/res/drawable-hdpi/ic_plus_disabled_holo_dark.png
deleted file mode 100644
index 723e362..0000000
--- a/res/drawable-hdpi/ic_plus_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_plus_holo_dark.png b/res/drawable-hdpi/ic_plus_holo_dark.png
deleted file mode 100644
index d7b2804..0000000
--- a/res/drawable-hdpi/ic_plus_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_text_holo_dark.png b/res/drawable-hdpi/ic_text_holo_dark.png
deleted file mode 100644
index 6d21e42..0000000
--- a/res/drawable-hdpi/ic_text_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_trash_holo_dark.png b/res/drawable-hdpi/ic_trash_holo_dark.png
deleted file mode 100644
index ec925f1..0000000
--- a/res/drawable-hdpi/ic_trash_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_activated_holo.9.png b/res/drawable-hdpi/list_activated_holo.9.png
deleted file mode 100644
index 4ea7afa..0000000
--- a/res/drawable-hdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_background_holo.9.png b/res/drawable-hdpi/list_background_holo.9.png
deleted file mode 100644
index cddf9be..0000000
--- a/res/drawable-hdpi/list_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_focused_holo.9.png b/res/drawable-hdpi/list_focused_holo.9.png
deleted file mode 100644
index 86578be..0000000
--- a/res/drawable-hdpi/list_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png b/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png
deleted file mode 100644
index f6fd30d..0000000
--- a/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_title_holo.9.png b/res/drawable-hdpi/list_title_holo.9.png
deleted file mode 100644
index ae93717..0000000
--- a/res/drawable-hdpi/list_title_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_ab_history_holo_dark.png b/res/drawable-mdpi/ic_ab_history_holo_dark.png
deleted file mode 100644
index 85bf5f3..0000000
--- a/res/drawable-mdpi/ic_ab_history_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_add_contact_holo_dark.png b/res/drawable-mdpi/ic_add_contact_holo_dark.png
deleted file mode 100644
index 867f494..0000000
--- a/res/drawable-mdpi/ic_add_contact_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_dial_action_search.png b/res/drawable-mdpi/ic_dial_action_search.png
deleted file mode 100644
index 88cba92..0000000
--- a/res/drawable-mdpi/ic_dial_action_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_overflow.png b/res/drawable-mdpi/ic_menu_overflow.png
deleted file mode 100644
index 4a3bde3..0000000
--- a/res/drawable-mdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_minus_disabled_holo_dark.png b/res/drawable-mdpi/ic_minus_disabled_holo_dark.png
deleted file mode 100644
index fb0103c..0000000
--- a/res/drawable-mdpi/ic_minus_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_minus_holo_dark.png b/res/drawable-mdpi/ic_minus_holo_dark.png
deleted file mode 100644
index a020991..0000000
--- a/res/drawable-mdpi/ic_minus_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_plus_disabled_holo_dark.png b/res/drawable-mdpi/ic_plus_disabled_holo_dark.png
deleted file mode 100644
index 70c9a3d..0000000
--- a/res/drawable-mdpi/ic_plus_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_plus_holo_dark.png b/res/drawable-mdpi/ic_plus_holo_dark.png
deleted file mode 100644
index 4f6397c..0000000
--- a/res/drawable-mdpi/ic_plus_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_text_holo_dark.png b/res/drawable-mdpi/ic_text_holo_dark.png
deleted file mode 100644
index 80b95ee..0000000
--- a/res/drawable-mdpi/ic_text_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_trash_holo_dark.png b/res/drawable-mdpi/ic_trash_holo_dark.png
deleted file mode 100644
index 291fc66..0000000
--- a/res/drawable-mdpi/ic_trash_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_activated_holo.9.png b/res/drawable-mdpi/list_activated_holo.9.png
deleted file mode 100644
index 3bf8e03..0000000
--- a/res/drawable-mdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_background_holo.9.png b/res/drawable-mdpi/list_background_holo.9.png
deleted file mode 100644
index 7d5d66d..0000000
--- a/res/drawable-mdpi/list_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_focused_holo.9.png b/res/drawable-mdpi/list_focused_holo.9.png
deleted file mode 100644
index 86578be..0000000
--- a/res/drawable-mdpi/list_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png b/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png
deleted file mode 100644
index 92da2f0..0000000
--- a/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_title_holo.9.png b/res/drawable-mdpi/list_title_holo.9.png
deleted file mode 100644
index 64bd691..0000000
--- a/res/drawable-mdpi/list_title_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw580dp-hdpi/list_activated_holo.9.png b/res/drawable-sw580dp-hdpi/list_activated_holo.9.png
deleted file mode 100644
index 046b24a..0000000
--- a/res/drawable-sw580dp-hdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw580dp-mdpi/list_activated_holo.9.png b/res/drawable-sw580dp-mdpi/list_activated_holo.9.png
deleted file mode 100644
index 1ff3373..0000000
--- a/res/drawable-sw580dp-mdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw580dp-xhdpi/list_activated_holo.9.png b/res/drawable-sw580dp-xhdpi/list_activated_holo.9.png
deleted file mode 100644
index 2eb7c7e..0000000
--- a/res/drawable-sw580dp-xhdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_ab_history_holo_dark.png b/res/drawable-xhdpi/ic_ab_history_holo_dark.png
deleted file mode 100644
index 98cc1af..0000000
--- a/res/drawable-xhdpi/ic_ab_history_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_add_contact_holo_dark.png b/res/drawable-xhdpi/ic_add_contact_holo_dark.png
deleted file mode 100644
index 7298882..0000000
--- a/res/drawable-xhdpi/ic_add_contact_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_dial_action_search.png b/res/drawable-xhdpi/ic_dial_action_search.png
deleted file mode 100644
index fe3aa24..0000000
--- a/res/drawable-xhdpi/ic_dial_action_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_overflow.png b/res/drawable-xhdpi/ic_menu_overflow.png
deleted file mode 100644
index 715cff8..0000000
--- a/res/drawable-xhdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_minus_disabled_holo_dark.png b/res/drawable-xhdpi/ic_minus_disabled_holo_dark.png
deleted file mode 100644
index ae6bce7..0000000
--- a/res/drawable-xhdpi/ic_minus_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_minus_holo_dark.png b/res/drawable-xhdpi/ic_minus_holo_dark.png
deleted file mode 100644
index 0e95a6b..0000000
--- a/res/drawable-xhdpi/ic_minus_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_plus_disabled_holo_dark.png b/res/drawable-xhdpi/ic_plus_disabled_holo_dark.png
deleted file mode 100644
index 169da3e..0000000
--- a/res/drawable-xhdpi/ic_plus_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_plus_holo_dark.png b/res/drawable-xhdpi/ic_plus_holo_dark.png
deleted file mode 100644
index b869bf9..0000000
--- a/res/drawable-xhdpi/ic_plus_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_text_holo_dark.png b/res/drawable-xhdpi/ic_text_holo_dark.png
deleted file mode 100644
index e80a042..0000000
--- a/res/drawable-xhdpi/ic_text_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_trash_holo_dark.png b/res/drawable-xhdpi/ic_trash_holo_dark.png
deleted file mode 100644
index 70e4d30..0000000
--- a/res/drawable-xhdpi/ic_trash_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_activated_holo.9.png b/res/drawable-xhdpi/list_activated_holo.9.png
deleted file mode 100644
index eda10e6..0000000
--- a/res/drawable-xhdpi/list_activated_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_background_holo.9.png b/res/drawable-xhdpi/list_background_holo.9.png
deleted file mode 100644
index b652725..0000000
--- a/res/drawable-xhdpi/list_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_focused_holo.9.png b/res/drawable-xhdpi/list_focused_holo.9.png
deleted file mode 100644
index 86578be..0000000
--- a/res/drawable-xhdpi/list_focused_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png b/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png
deleted file mode 100644
index 88726b6..0000000
--- a/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_title_holo.9.png b/res/drawable-xhdpi/list_title_holo.9.png
deleted file mode 100644
index f4f00ca..0000000
--- a/res/drawable-xhdpi/list_title_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_minus.xml b/res/drawable/ic_minus.xml
deleted file mode 100644
index 9750127..0000000
--- a/res/drawable/ic_minus.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_enabled="false" android:drawable="@drawable/ic_minus_disabled_holo_dark" />
- <item android:drawable="@drawable/ic_minus_holo_dark" />
-</selector>
diff --git a/res/drawable/ic_plus.xml b/res/drawable/ic_plus.xml
deleted file mode 100644
index 176b21a..0000000
--- a/res/drawable/ic_plus.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_enabled="false" android:drawable="@drawable/ic_plus_disabled_holo_dark" />
- <item android:drawable="@drawable/ic_plus_holo_dark" />
-</selector>
diff --git a/res/drawable/ic_tab_all.xml b/res/drawable/ic_tab_all.xml
deleted file mode 100644
index 97c4443..0000000
--- a/res/drawable/ic_tab_all.xml
+++ /dev/null
@@ -1,20 +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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/ic_contacts_holo_dark" />
-</selector>
-
diff --git a/res/drawable/ic_tab_recent.xml b/res/drawable/ic_tab_recent.xml
deleted file mode 100644
index cccc9ae..0000000
--- a/res/drawable/ic_tab_recent.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/ic_ab_history_holo_dark" />
-</selector>
-
diff --git a/res/drawable/list_item_activated_background.xml b/res/drawable/list_item_activated_background.xml
deleted file mode 100644
index a58577e..0000000
--- a/res/drawable/list_item_activated_background.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_activated="true" android:drawable="@drawable/list_activated_holo" />
- <item android:drawable="@drawable/list_background_holo" />
-</selector>
diff --git a/res/layout/account_filter_header_for_phone_favorite.xml b/res/layout/account_filter_header_for_phone_favorite.xml
deleted file mode 100644
index 6f1d23d..0000000
--- a/res/layout/account_filter_header_for_phone_favorite.xml
+++ /dev/null
@@ -1,36 +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.
--->
-
-<!-- Layout showing the type of account filter for phone favorite screen
- (or, new phone "all" screen).
- This is very similar to account_filter_header.xml but different in its
- top padding. -->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/account_filter_header_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingTop="8dip"
- android:layout_marginLeft="@dimen/contact_browser_list_header_left_margin"
- android:layout_marginRight="@dimen/contact_browser_list_header_right_margin"
- android:background="?android:attr/selectableItemBackground"
- android:visibility="gone">
- <TextView
- android:id="@+id/account_filter_header"
- style="@style/ContactListSeparatorTextViewStyle"
- android:paddingLeft="@dimen/contact_browser_list_item_text_indent" />
-</LinearLayout>
diff --git a/res/layout/empty2.xml b/res/layout/empty2.xml
deleted file mode 100644
index 349dcfa..0000000
--- a/res/layout/empty2.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<!-- Hack for show empty hidden menu item without using android:icon.
- See dialtact_options.xml for more detail.
-
- TODO: figure out better way -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content">
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_dial_action_search"
- android:visibility="invisible"/>
-</FrameLayout>
diff --git a/res/layout/phone_contact_tile_list.xml b/res/layout/phone_contact_tile_list.xml
deleted file mode 100644
index 8931cf6..0000000
--- a/res/layout/phone_contact_tile_list.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<!-- Use LinearLayout + FrameLayout, just to rely on android:divider and android:showDividers -->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/FragmentActionBarPadding"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:divider="?android:attr/dividerHorizontal"
- android:showDividers="end">
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
- <ListView
- android:id="@+id/contact_tile_list"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingTop="@dimen/contact_tile_list_padding_top"
- android:clipToPadding="false"
- android:fadingEdge="none"
- android:divider="@null" />
-
- <TextView
- android:id="@+id/contact_tile_list_empty"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:layout_marginTop="@dimen/empty_message_top_margin"
- android:textColor="?android:attr/textColorSecondary"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
- </FrameLayout>
-</LinearLayout>
diff --git a/res/layout/phone_loading_contacts.xml b/res/layout/phone_loading_contacts.xml
deleted file mode 100644
index f0d3328..0000000
--- a/res/layout/phone_loading_contacts.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<!-- "Loading" text with a spinner, which is used in PhoneFavorite screen -->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:orientation="horizontal"
- android:gravity="left|center_vertical">
-
- <ProgressBar
- android:indeterminate="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/progress_spinner"/>
-
- <TextView
- android:id="@+id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/contact_list_loading"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_marginLeft="4dip" />
-
-</LinearLayout>
diff --git a/res/layout/stream_item_photo.xml b/res/layout/stream_item_photo.xml
index 2649828..9e27d2a 100644
--- a/res/layout/stream_item_photo.xml
+++ b/res/layout/stream_item_photo.xml
@@ -15,7 +15,7 @@
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android">
- <com.android.contacts.widget.LayoutSuppressingImageView
+ <com.android.contacts.common.widget.LayoutSuppressingImageView
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
diff --git a/res/menu/phone_favorite_options.xml b/res/menu/phone_favorite_options.xml
deleted file mode 100644
index e37759c..0000000
--- a/res/menu/phone_favorite_options.xml
+++ /dev/null
@@ -1,28 +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.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:id="@+id/menu_import_export"
- android:title="@string/menu_import_export" />
-
- <item
- android:id="@+id/menu_clear_frequents"
- android:title="@string/menu_clear_frequents" />
-
- <item
- android:id="@+id/menu_accounts"
- android:title="@string/menu_accounts" />
-</menu>
diff --git a/res/values-land/integers.xml b/res/values-land/integers.xml
index bc9b2b7..d247e46 100644
--- a/res/values-land/integers.xml
+++ b/res/values-land/integers.xml
@@ -15,5 +15,4 @@
-->
<resources>
<integer name="contact_tile_column_count">4</integer>
- <integer name="contact_tile_column_count_in_favorites">4</integer>
</resources>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index e1d8a49..341bc1f 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -25,7 +25,4 @@
<item name="android:layout_weight">1</item>
</style>
- <style name="FragmentActionBarPadding">
- <item name="android:paddingBottom">0dp</item>
- </style>
</resources>
diff --git a/res/values-sw580dp-land/integers.xml b/res/values-sw580dp-land/integers.xml
index 191eeb8..8ce96de 100644
--- a/res/values-sw580dp-land/integers.xml
+++ b/res/values-sw580dp-land/integers.xml
@@ -15,6 +15,5 @@
-->
<resources>
<integer name="contact_tile_column_count">3</integer>
- <integer name="contact_tile_column_count_in_favorites">3</integer>
<integer name="updates_tab_snippet_max_lines">7</integer>
</resources>
diff --git a/res/values-sw580dp/dimens.xml b/res/values-sw580dp/dimens.xml
index 4c4505c..ae507f9 100644
--- a/res/values-sw580dp/dimens.xml
+++ b/res/values-sw580dp/dimens.xml
@@ -30,7 +30,6 @@
<!-- Center vertically -->
<dimen name="quick_contact_top_position">-1px</dimen>
<!-- Contact list (vertical scroll bar comes left) -->
- <dimen name="contact_browser_list_top_margin">16dip</dimen>
<dimen name="list_visible_scrollbar_padding">32dip</dimen>
<dimen name="list_header_extra_top_padding">@dimen/contact_browser_list_top_margin</dimen>
diff --git a/res/values-sw580dp/integers.xml b/res/values-sw580dp/integers.xml
index cdf6e4a..a62fa14 100644
--- a/res/values-sw580dp/integers.xml
+++ b/res/values-sw580dp/integers.xml
@@ -15,6 +15,5 @@
-->
<resources>
<integer name="contact_tile_column_count">2</integer>
- <integer name="contact_tile_column_count_in_favorites">3</integer>
<integer name="updates_tab_snippet_max_lines">4</integer>
</resources>
diff --git a/res/values-sw580dp/styles.xml b/res/values-sw580dp/styles.xml
index ce0ec15..3d919d6 100644
--- a/res/values-sw580dp/styles.xml
+++ b/res/values-sw580dp/styles.xml
@@ -122,13 +122,4 @@
<item name="android:layout_height">200dip</item>
</style>
- <style name="BackgroundOnlyTheme" parent="@android:Theme.Holo.Light">
- <item name="android:windowBackground">@null</item>
- <item name="android:windowContentOverlay">@null</item>
- <item name="android:windowAnimationStyle">@null</item>
- <item name="android:windowNoTitle">true</item>
- <item name="android:windowNoDisplay">true</item>
- <item name="android:windowIsFloating">true</item>
- </style>
-
</resources>
diff --git a/res/values-sw680dp-land/integers.xml b/res/values-sw680dp-land/integers.xml
index bc9b2b7..d247e46 100644
--- a/res/values-sw680dp-land/integers.xml
+++ b/res/values-sw680dp-land/integers.xml
@@ -15,5 +15,4 @@
-->
<resources>
<integer name="contact_tile_column_count">4</integer>
- <integer name="contact_tile_column_count_in_favorites">4</integer>
</resources>
diff --git a/res/values-sw680dp/integers.xml b/res/values-sw680dp/integers.xml
index 5b348a5..eaf5971 100644
--- a/res/values-sw680dp/integers.xml
+++ b/res/values-sw680dp/integers.xml
@@ -15,6 +15,5 @@
-->
<resources>
<integer name="contact_tile_column_count">2</integer>
- <integer name="contact_tile_column_count_in_favorites">2</integer>
<integer name="updates_tab_snippet_max_lines">7</integer>
</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index d7845c4..6da3b94 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -51,12 +51,4 @@
<attr name="layout_widePaddingRight" format="dimension"/>
</declare-styleable>
- <declare-styleable name="ProportionalLayout">
- <attr name="direction" format="string"/>
- <attr name="ratio" format="float"/>
- </declare-styleable>
-
- <declare-styleable name="Favorites">
- <attr name="favorites_padding_bottom" format="dimension" />
- </declare-styleable>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 99e917b..7fc7c6e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -30,21 +30,6 @@
<!-- Color of the text in the updates tab in the tab carousel on the contact detail page -->
<color name="detail_update_tab_text_color">#777777</color>
- <!-- Color of the text describing an unconsumed missed call. -->
- <color name="call_log_missed_call_highlight_color">#FF0000</color>
-
- <!-- Color of the text describing an unconsumed voicemail. -->
- <color name="call_log_voicemail_highlight_color">#33b5e5</color>
-
- <!-- Colour background for the voicemail playback ui. -->
- <color name="voicemail_playback_ui_background">@android:color/black</color>
-
- <!-- Colour of voicemail progress bar to the right of position indicator. -->
- <color name="voicemail_playback_seek_bar_yet_to_play">#44ffffff</color>
-
- <!-- Colour of voicemail progress bar to the left of position indicator. -->
- <color name="voicemail_playback_seek_bar_already_played">#ccffffff</color>
-
<!-- Color of the text of the tab carousel in the contact details -->
<color name="detail_tab_carousel_tab_label_color">#EEEEEE</color>
@@ -54,7 +39,4 @@
<!-- Color of the vertical stripe that goes on the left of a block quote inside a stream item -->
<color name="stream_item_stripe_color">#CCCCCC</color>
- <!-- Standard color for selected items. -->
- <color name="item_selected">#660099cc</color>
-
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d8a9e94..57c863d 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -124,17 +124,12 @@
<!-- Width of search view in action bar. Use 0dip for MATCH_PARENT -->
<dimen name="search_view_width">0dip</dimen>
- <!-- contact browser list margins -->
- <dimen name="contact_browser_list_item_photo_size">64dip</dimen>
- <dimen name="contact_browser_list_top_margin">8dip</dimen>
<!-- For join screen. Mainly for tablet. -->
<dimen name="join_header_left_margin">@dimen/contact_browser_list_header_left_margin</dimen>
<dimen name="join_header_right_margin">@dimen/contact_browser_list_header_right_margin</dimen>
<dimen name="join_header_top_margin">16dip</dimen>
<dimen name="join_header_bottom_margin">0dip</dimen>
- <!-- Empty message margins -->
- <dimen name="empty_message_top_margin">48dip</dimen>
<dimen name="no_accounts_message_margin">20dip</dimen>
<dimen name="contact_filter_header_min_height">24dip</dimen>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 6d5f7c9..e742ba0 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -18,9 +18,6 @@
<!-- Determines the number of columns in a ContactTileRow -->
<integer name="contact_tile_column_count">2</integer>
- <!-- Determines the number of columns in a ContactTileRow in the favorites tab -->
- <integer name="contact_tile_column_count_in_favorites">2</integer>
-
<!-- Max lines to display of a contact's snippet in the "updates" tab of the contact card tab carousel -->
<integer name="updates_tab_snippet_max_lines">3</integer>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 76a036d..de55344 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -88,18 +88,9 @@
<!-- Hint text in the search box when the user hits the Search key while in the contacts app -->
<string name="searchHint">Search contacts</string>
- <!-- Menu item to search contacts -->
- <string name="menu_search">Search</string>
-
- <!-- Menu item to create a new contact -->
- <string name="menu_newContact">New contact</string>
-
<!-- Menu item used to view the details for a specific contact -->
<string name="menu_viewContact">View contact</string>
- <!-- Menu item used to call a contact, containing the number of the contact to call -->
- <string name="menu_callNumber">Call <xliff:g id="number">%s</xliff:g></string>
-
<!-- Menu item used to add a star to a contact, which makes that contact show up at the top of favorites -->
<string name="menu_addStar">Add to favorites</string>
@@ -112,9 +103,6 @@
<!-- Menu item used to delete a specific contact -->
<string name="menu_deleteContact">Delete</string>
- <!-- Menu item to copy something [CHAR_LIMIT=10] -->
- <string name="menu_copy">Copy</string>
-
<!-- Menu item used to create a contact shortcut when viewing contact details. [CHAR LIMIT=30] -->
<string name="menu_create_contact_shortcut">Place on Home screen</string>
@@ -276,18 +264,6 @@
<item quantity="other"><xliff:g id="count">%d</xliff:g> contacts</item>
</plurals>
- <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when "All contacts" is selected [CHAR LIMIT=64]-->
- <string name="listTotalAllContactsZero">No contacts.</string>
-
- <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when "Custom" is selected [CHAR LIMIT=64]-->
- <string name="listTotalAllContactsZeroCustom">No visible contacts.</string>
-
- <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when starred contact list is selected [CHAR LIMIT=64]-->
- <string name="listTotalAllContactsZeroStarred">No favorites.</string>
-
- <!-- 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 total number of contacts found when "Only contacts with phones" not selected [CHAR LIMIT=30] -->
<plurals name="listFoundAllContacts">
<item quantity="one">1 found</item>
@@ -319,85 +295,6 @@
[CHAR LIMIT=NONE] -->
<string name="contactsGroupsLabel">Groups</string>
- <!-- The description text for the favorites tab.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
-
- [CHAR LIMIT=NONE] -->
- <string name="contactsFavoritesLabel">Favorites</string>
-
- <!-- The title of a dialog that displays the IMEI of the phone -->
- <string name="imei">IMEI</string>
-
- <!-- The title of a dialog that displays the MEID of the CDMA phone -->
- <string name="meid">MEID</string>
-
- <!-- String used for displaying calls to the voicemail number in the call log -->
- <string name="voicemail">Voicemail</string>
-
- <!-- String used to display calls from unknown numbers in the call log -->
- <string name="unknown">Unknown</string>
-
- <!-- String used to display calls from private numbers in the call log -->
- <string name="private_num">Private number</string>
-
- <!-- String used to display calls from pay phone in the call log -->
- <string name="payphone">Pay phone</string>
-
- <!-- Displayed in the text entry box in the dialer when in landscape mode to guide the user
- to dial using the physical keyboard -->
- <string name="dialerKeyboardHintText">Use keyboard to dial</string>
-
- <!-- Hint text displayed in the "digits" field above the dialer's
- dialpad, if there's already a call in progress. (This hint
- reminds the user that the dialer will add a new call, as opposed
- to sending DTMF tones over the current call.)
- [CHAR LIMIT=40] -->
- <string name="dialerDialpadHintText">Dial to add a call</string>
-
- <!-- Dialog text displayed when loading a phone number from the SIM card for speed dial -->
- <string name="simContacts_emptyLoading">Loading from SIM card\u2026</string>
-
- <!-- Dialog title displayed when loading a phone number from the SIM card for speed dial -->
- <string name="simContacts_title">SIM card contacts</string>
-
- <!-- Item label: jump to the in-call DTMF dialpad.
- (Part of a list of options shown in the dialer when another call
- is already in progress.) -->
- <string name="dialer_useDtmfDialpad">Use touch tone keypad</string>
-
- <!-- Item label: jump to the in-call UI.
- (Part of a list of options shown in the dialer when another call
- is already in progress.) -->
- <string name="dialer_returnToInCallScreen">Return to call in progress</string>
-
- <!-- Item label: use the Dialer's dialpad to add another call.
- (Part of a list of options shown in the dialer when another call
- is already in progress.) -->
- <string name="dialer_addAnotherCall">Add call</string>
-
- <!-- Title bar for call detail screen -->
- <string name="callDetailTitle">Call details</string>
-
- <!-- Toast for call detail screen when couldn't read the requested details -->
- <string name="toast_call_detail_error">Couldn\'t read details for the requested call.</string>
-
- <!-- Title for incoming call details screen -->
- <string name="type_incoming">Incoming call</string>
-
- <!-- Title for outgoing call details screen -->
- <string name="type_outgoing">Outgoing call</string>
-
- <!-- Title for missed call details screen -->
- <string name="type_missed">Missed call</string>
-
- <!-- Title for voicemail details screen -->
- <string name="type_voicemail">Voicemail</string>
-
- <!-- Description for incoming calls going to voice mail vs. not -->
- <string name="actionIncomingCall">Incoming calls</string>
-
<!-- Action string for calling back a number in the call log -->
<string name="callBack">Call back</string>
@@ -407,128 +304,10 @@
<!-- Action string for returning a missed call in the call log -->
<string name="returnCall">Return call</string>
- <!-- A nicely formatted call duration displayed when viewing call details. For example "42 mins 28 secs" -->
- <string name="callDetailsDurationFormat"><xliff:g id="minutes" example="42">%s</xliff:g> mins <xliff:g id="seconds" example="28">%s</xliff:g> secs</string>
-
<!-- Dialog message when prompting before creating a contact. Includes
the email address, e.g. "Add xyz@foo.com to contacts?" -->
<string name="add_contact_dlg_message_fmt">Add \"<xliff:g id="email">%s</xliff:g>\" to contacts?</string>
- <!-- String describing the image on ImageButton one
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_image_button_one">one</string>
-
- <!-- String describing the image on ImageButton two
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_image_button_two">two</string>
-
- <!-- String describing the image on ImageButton three
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_image_button_three">three</string>
-
- <!-- String describing the image on ImageButton four
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_image_button_four">four</string>
-
- <!-- String describing the image on ImageButton five
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_image_button_five">five</string>
-
- <!-- String describing the image on ImageButton six
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_image_button_six">six</string>
-
- <!-- String describing the image on ImageButton seven
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_image_button_seven">seven</string>
-
- <!-- String describing the image on ImageButton eight
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_image_button_eight">eight</string>
-
- <!-- String describing the image on ImageButton nine
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_image_button_nine">nine</string>
-
- <!-- String describing the image on ImageButton star
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_image_button_star">star</string>
-
- <!-- String describing the image on ImageButton zero
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_image_button_zero">zero</string>
-
- <!-- String describing the image on ImageButton pound
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_image_button_pound">pound</string>
-
- <!-- String describing the Voicemail ImageButton
-
- Used by AccessibilityService to announce the purpose of the button.
- -->
- <string name="description_voicemail_button">voicemail</string>
-
- <!-- String describing the Search ImageButton
-
- Used by AccessibilityService to announce the purpose of the button.
- [CHAR LIMIT=NONE]
- -->
- <string name="description_search_button">search</string>
-
- <!-- String describing the Dial ImageButton
-
- Used by AccessibilityService to announce the purpose of the button.
- -->
- <string name="description_dial_button">dial</string>
-
- <!-- String describing the Delete/Backspace ImageButton
-
- Used by AccessibilityService to announce the purpose of the button.
- -->
- <string name="description_delete_button">backspace</string>
-
- <!-- String describing the digits text box containing the number to dial.
-
- Used by AccessibilityService to announce the purpose of the view.
- -->
- <string name="description_digits_edittext">number to dial</string>
-
<!-- String describing the Contact Photo Image
Used by AccessibilityService to announce the purpose of the view.
@@ -547,29 +326,10 @@
<!-- The string used to describe Contacts as a searchable item within system search settings. -->
<string name="search_settings_description">Names of your contacts</string>
- <!-- Menu items for dialpad options as part of Pause and Wait ftr -->
- <string name="add_2sec_pause">Add 2-sec pause</string>
- <string name="add_wait">Add wait</string>
-
- <!-- Menu item label for call settings [CHAR LIMIT=30] -->
- <string name="call_settings">Settings</string>
-
<!-- Shown as a toast when the user taps on a QuickContact icon, and no application
was found that could perform the selected action. [CHAR LIMIT=NONE] -->
<string name="quickcontact_missing_app">No app was found to handle this action.</string>
- <!-- The menu item to open the list of accounts -->
- <string name="menu_accounts">Accounts</string>
-
- <!-- The menu item to clear frequents [CHAR LIMIT=30] -->
- <string name="menu_clear_frequents">Clear frequents</string>
-
- <!-- The menu item to filter the list of contacts displayed -->
- <string name="menu_contacts_filter">Contacts to display</string>
-
- <!-- The menu item to bulk import or bulk export contacts from SIM card or SD card. [CHAR LIMIT=30]-->
- <string name="menu_import_export">Import/export</string>
-
<!-- The menu item to share the currently viewed contact [CHAR LIMIT=30] -->
<string name="menu_share">Share</string>
@@ -741,18 +501,9 @@
<!-- Contact list filter indicating that the list shows groups chosen by the user [CHAR LIMIT=64] -->
<string name="list_filter_custom">Custom</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>
-
- <!-- Message that appears in the favorites tab of the Phone app when the contact list has not fully loaded yet (below the favorite and frequent contacts) [CHAR LIMIT=20] -->
- <string name="contact_list_loading">Loading\u2026</string>
-
<!-- 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" msgid="377929915873428211">Settings</string>
@@ -766,9 +517,6 @@
of a Contact. This is mostly about the formatting of the two elements, so it should be kept small [CHAR LIMIT=79] -->
<string name="organization_company_and_title"><xliff:g id="company" example="Technical Program Manager">%2$s</xliff:g>, <xliff:g id="company" example="Google Inc.">%1$s</xliff:g></string>
- <!-- Query hint displayed inside the search field [CHAR LIMIT=64] -->
- <string name="hint_findContacts">Find contacts</string>
-
<!-- Title shown for the phone number when the number tries to call on a device that it not a phone [CHAR LIMIT=30] -->
<string name="non_phone_caption">Phone number</string>
@@ -871,114 +619,6 @@
<!-- Hint text in the group name box in the edit group view. [CHAR LIMIT=20]-->
<string name="group_name_hint">Group\'s name</string>
- <!-- Menu item used to show only outgoing in the call log. [CHAR LIMIT=30] -->
- <string name="menu_show_outgoing_only">Show outgoing only</string>
-
- <!-- Menu item used to show only incoming in the call log. [CHAR LIMIT=30] -->
- <string name="menu_show_incoming_only">Show incoming only</string>
-
- <!-- Menu item used to show only missed in the call log. [CHAR LIMIT=30] -->
- <string name="menu_show_missed_only">Show missed only</string>
-
- <!-- Menu item used to show only voicemails in the call log. [CHAR LIMIT=30] -->
- <string name="menu_show_voicemails_only">Show voicemails only</string>
-
- <!-- Menu item used to show all calls in the call log. [CHAR LIMIT=30] -->
- <string name="menu_show_all_calls">Show all calls</string>
-
- <!-- String describing the icon in the call log used to play a voicemail.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_call_log_play_button">Play voicemail</string>
-
- <!-- String describing the icon in the call log used to represent an incoming call.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_call_log_incoming_call">Incoming call</string>
-
- <!-- String describing the icon in the call log used to represent an outgoing call.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
-
- <string name="description_call_log_outgoing_call">Outgoing call</string>
-
- <!-- String describing the icon in the call log used to represent a missed call.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
-
- <string name="description_call_log_missed_call">Missed call</string>
-
- <!-- String describing the icon in the call log used to represent a voicemail left to the user.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_call_log_voicemail">Voicemail</string>
-
- <!-- String describing the button to add a contact for the current number.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_add_contact">Add contact</string>
-
- <!-- String describing the button to view the contact for the current number.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_view_contact">View contact <xliff:g id="name">%1$s</xliff:g></string>
-
- <!-- String describing the button to call a number or contact.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_call">Call <xliff:g id="name">%1$s</xliff:g></string>
-
- <!-- String describing the button to SMS a number or contact.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- [CHAR LIMIT=NONE]
- -->
- <string name="description_send_text_message">Send text message to <xliff:g id="name">%1$s</xliff:g></string>
-
- <!-- String describing the icon in the call log used to represent an unheard voicemail left to
- the user.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- [CHAR LIMIT=NONE]
- -->
- <string name="description_call_log_unheard_voicemail">Unheard voicemail</string>
-
- <!-- String describing the button to send a text message on quick contact.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- [CHAR LIMIT=NONE]
- -->
- <string name="description_send_message">Send message to <xliff:g id="name">%1$s</xliff:g></string>
-
- <!-- String describing the text for a phone number in quick contact.
-
- Note: AccessibilityServices use this attribute to announce what the view represents.
- This is especially valuable for views without textual representation like ImageView.
- -->
- <string name="description_dial_phone_number">Dial phone <xliff:g id="name">%1$s</xliff:g></string>
-
- <!-- The string used to represent an unknown location for a phone number in the call log [CHAR LIMIT=3] -->
- <string name="call_log_empty_gecode">-</string>
-
<!-- Header label in the contact editor for a profile that is local to the device only (and not associated with any account) [CHAR LIMIT=25] -->
<string name="local_profile_title">My local profile</string>
@@ -1016,26 +656,7 @@
<!-- Button label to prompt the user to add another account (when there are already existing accounts on the device) [CHAR LIMIT=30] -->
<string name="add_new_account">Add new account</string>
- <!-- Dialog message which is shown when the user tries to make a phone call
- to prohibited phone numbers [CHAR LIMIT=NONE] -->
- <string name="dialog_phone_call_prohibited_message" msgid="4313552620858880999">Call not sent</string>
-
- <!-- Dialog message which is shown when the user tries to check voicemail
- while the system isn't ready for the access. [CHAR LIMIT=NONE] -->
- <string name="dialog_voicemail_not_ready_message">To set up voicemail, go to Menu > Settings.</string>
-
- <!-- Dialog message which is shown when the user tries to check voicemail
- while the system is in airplane mode. The user cannot access to
- voicemail service in Airplane mode. [CHAR LIMI=NONE] -->
- <string name="dialog_voicemail_airplane_mode_message">To call voicemail, first turn off Airplane mode.</string>
-
<!-- Menu item shown only when the special debug mode is enabled, which is used to send all contacts database files via email. [CHAR LIMI=NONE] -->
<string name="menu_export_database">Export database files</string>
- <!-- Content description for the fake action menu overflow button.
- This should be same as the description for the real action menu
- overflow button available in ActionBar.
- [CHAR LIMIT=NONE] -->
- <string name="action_menu_overflow_description" msgid="2295659037509008453">More options</string>
-
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6208018..2492b7d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -34,15 +34,6 @@
<item name="android:listViewStyle">@style/ListViewStyle</item>
</style>
- <style name="BackgroundOnlyTheme" parent="@android:style/Theme.Holo.Light">
- <item name="android:windowBackground">@null</item>
- <item name="android:windowContentOverlay">@null</item>
- <item name="android:windowAnimationStyle">@null</item>
- <item name="android:windowNoTitle">true</item>
- <item name="android:windowNoDisplay">true</item>
- <item name="android:windowIsFloating">true</item>
- </style>
-
<style name="Theme">
</style>
@@ -232,7 +223,4 @@
<item name="android:textSize">18sp</item>
</style>
- <style name="FragmentActionBarPadding">
- <item name="android:paddingBottom">?android:attr/actionBarSize</item>
- </style>
</resources>
diff --git a/src/com/android/contacts/group/GroupEditorFragment.java b/src/com/android/contacts/group/GroupEditorFragment.java
index 1f7074e..6f9c4f9 100644
--- a/src/com/android/contacts/group/GroupEditorFragment.java
+++ b/src/com/android/contacts/group/GroupEditorFragment.java
@@ -70,7 +70,7 @@
import com.android.contacts.group.SuggestedMemberListAdapter.SuggestedMember;
import com.android.contacts.common.model.AccountTypeManager;
import com.android.contacts.common.util.AccountsListAdapter.AccountListFilter;
-import com.android.contacts.util.ViewUtil;
+import com.android.contacts.common.util.ViewUtil;
import com.google.common.base.Objects;
import java.util.ArrayList;
diff --git a/src/com/android/contacts/list/ContactTileFrequentView.java b/src/com/android/contacts/list/ContactTileFrequentView.java
deleted file mode 100644
index df54cef..0000000
--- a/src/com/android/contacts/list/ContactTileFrequentView.java
+++ /dev/null
@@ -1,41 +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.
- */
-package com.android.contacts.list;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import com.android.contacts.common.list.ContactTileView;
-import com.android.contacts.util.ViewUtil;
-
-/**
- * A {@link com.android.contacts.common.list.ContactTileView} that is used for most frequently contacted in the People app
- */
-public class ContactTileFrequentView extends ContactTileView {
- public ContactTileFrequentView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- @Override
- protected boolean isDarkTheme() {
- return false;
- }
-
- @Override
- protected int getApproximateImageSize() {
- return ViewUtil.getConstantPreLayoutWidth(getQuickContact());
- }
-}
diff --git a/src/com/android/contacts/list/ContactTilePhoneFrequentView.java b/src/com/android/contacts/list/ContactTilePhoneFrequentView.java
deleted file mode 100644
index f0aed65..0000000
--- a/src/com/android/contacts/list/ContactTilePhoneFrequentView.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.
- */
-package com.android.contacts.list;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.android.contacts.common.MoreContactUtils;
-import com.android.contacts.common.list.ContactTileView;
-import com.android.contacts.common.list.ContactTileAdapter.ContactEntry;
-import com.android.contacts.util.ViewUtil;
-
-/**
- * A dark version of the {@link com.android.contacts.common.list.ContactTileView} that is used in Dialtacts
- * for frequently called contacts. Slightly different behavior from superclass...
- * when you tap it, you want to call the frequently-called number for the
- * contact, even if that is not the default number for that contact.
- */
-public class ContactTilePhoneFrequentView extends ContactTileView {
- private String mPhoneNumberString;
-
- public ContactTilePhoneFrequentView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- @Override
- protected boolean isDarkTheme() {
- return true;
- }
-
- @Override
- protected int getApproximateImageSize() {
- return ViewUtil.getConstantPreLayoutWidth(getQuickContact());
- }
-
- @Override
- public void loadFromContact(ContactEntry entry) {
- super.loadFromContact(entry);
- mPhoneNumberString = null; // ... in case we're reusing the view
- if (entry != null) {
- // Grab the phone-number to call directly... see {@link onClick()}
- mPhoneNumberString = entry.phoneNumber;
- }
- }
-
- @Override
- protected OnClickListener createClickListener() {
- return new OnClickListener() {
- @Override
- public void onClick(View v) {
- if (mListener == null) return;
- if (TextUtils.isEmpty(mPhoneNumberString)) {
- // Copy "superclass" implementation
- mListener.onContactSelected(getLookupUri(), MoreContactUtils
- .getTargetRectFromView(
- mContext, ContactTilePhoneFrequentView.this));
- } else {
- // When you tap a frequently-called contact, you want to
- // call them at the number that you usually talk to them
- // at (i.e. the one displayed in the UI), regardless of
- // whether that's their default number.
- mListener.onCallNumberDirectly(mPhoneNumberString);
- }
- }
- };
- }
-}
diff --git a/src/com/android/contacts/list/ContactTilePhoneStarredView.java b/src/com/android/contacts/list/ContactTilePhoneStarredView.java
deleted file mode 100644
index 07ee379..0000000
--- a/src/com/android/contacts/list/ContactTilePhoneStarredView.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- */
-package com.android.contacts.list;
-
-import android.content.Context;
-import android.content.Intent;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageButton;
-
-import com.android.contacts.R;
-import com.android.contacts.common.list.ContactTileView;
-
-/**
- * Displays the contact's picture overlayed with their name
- * in a perfect square. It also has an additional touch target for a secondary action.
- */
-public class ContactTilePhoneStarredView extends ContactTileView {
- private ImageButton mSecondaryButton;
-
- public ContactTilePhoneStarredView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- @Override
- protected void onFinishInflate() {
- super.onFinishInflate();
-
- mSecondaryButton = (ImageButton) findViewById(R.id.contact_tile_secondary_button);
- mSecondaryButton.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(Intent.ACTION_VIEW, getLookupUri());
- // Secondary target will be visible only from phone's favorite screen, then
- // we want to launch it as a separate People task.
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
- getContext().startActivity(intent);
- }
- });
- }
-
- @Override
- protected boolean isDarkTheme() {
- return true;
- }
-
- @Override
- protected int getApproximateImageSize() {
- // The picture is the full size of the tile (minus some padding, but we can be generous)
- return mListener.getApproximateTileWidth();
- }
-}
diff --git a/src/com/android/contacts/list/ContactTileStarredView.java b/src/com/android/contacts/list/ContactTileStarredView.java
deleted file mode 100644
index 2427add..0000000
--- a/src/com/android/contacts/list/ContactTileStarredView.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.
- */
-package com.android.contacts.list;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import com.android.contacts.common.list.ContactTileView;
-
-/**
- * A {@link ContactTileStarredView} displays the contact's picture overlayed with their name
- * in a square. The actual dimensions are set by
- * {@link com.android.contacts.common.list.ContactTileAdapter.ContactTileRow}.
- */
-public class ContactTileStarredView extends ContactTileView {
- public ContactTileStarredView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- @Override
- protected boolean isDarkTheme() {
- return false;
- }
-
- @Override
- protected int getApproximateImageSize() {
- // The picture is the full size of the tile (minus some padding, but we can be generous)
- return mListener.getApproximateTileWidth();
- }
-}
diff --git a/src/com/android/contacts/util/ViewUtil.java b/src/com/android/contacts/util/ViewUtil.java
deleted file mode 100644
index 89ab73d..0000000
--- a/src/com/android/contacts/util/ViewUtil.java
+++ /dev/null
@@ -1,42 +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.
- */
-
-package com.android.contacts.util;
-
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * Provides static functions to work with views
- */
-public class ViewUtil {
- private ViewUtil() {}
-
- /**
- * Returns the width as specified in the LayoutParams
- * @throws IllegalStateException Thrown if the view's width is unknown before a layout pass
- * s
- */
- public static int getConstantPreLayoutWidth(View view) {
- // We haven't been layed out yet, so get the size from the LayoutParams
- final ViewGroup.LayoutParams p = view.getLayoutParams();
- if (p.width < 0) {
- throw new IllegalStateException("Expecting view's width to be a constant rather " +
- "than a result of the layout pass");
- }
- return p.width;
- }
-}
diff --git a/src/com/android/contacts/widget/LayoutSuppressingImageView.java b/src/com/android/contacts/widget/LayoutSuppressingImageView.java
deleted file mode 100644
index d80aeea..0000000
--- a/src/com/android/contacts/widget/LayoutSuppressingImageView.java
+++ /dev/null
@@ -1,39 +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.
- */
-
-package com.android.contacts.widget;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.ImageView;
-
-/**
- * Custom {@link ImageView} that improves layouting performance.
- *
- * This improves the performance by not passing requestLayout() to its parent, taking advantage
- * of knowing that image size won't change once set.
- */
-public class LayoutSuppressingImageView extends ImageView {
-
- public LayoutSuppressingImageView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- @Override
- public void requestLayout() {
- forceLayout();
- }
-}
diff --git a/src/com/android/contacts/widget/LayoutSuppressingQuickContactBadge.java b/src/com/android/contacts/widget/LayoutSuppressingQuickContactBadge.java
deleted file mode 100644
index 3413e53..0000000
--- a/src/com/android/contacts/widget/LayoutSuppressingQuickContactBadge.java
+++ /dev/null
@@ -1,39 +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.
- */
-
-package com.android.contacts.widget;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.QuickContactBadge;
-
-/**
- * Custom {@link QuickContactBadge} that improves layouting performance.
- *
- * This improves the performance by not passing requestLayout() to its parent, taking advantage
- * of knowing that image size won't change once set.
- */
-public class LayoutSuppressingQuickContactBadge extends QuickContactBadge {
-
- public LayoutSuppressingQuickContactBadge(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- @Override
- public void requestLayout() {
- forceLayout();
- }
-}
