Merge "Remove unused resources and strings from Contacts." into nyc-dev
diff --git a/res/drawable-hdpi/ic_group_work_black_24dp.png b/res/drawable-hdpi/ic_group_work_black_24dp.png
deleted file mode 100644
index 664f07a..0000000
--- a/res/drawable-hdpi/ic_group_work_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_groups_holo_dark.png b/res/drawable-ldrtl-hdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 6fd82dd..0000000
--- a/res/drawable-ldrtl-hdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_groups_holo_dark.png b/res/drawable-ldrtl-mdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 4803d8d..0000000
--- a/res/drawable-ldrtl-mdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_groups_holo_dark.png b/res/drawable-ldrtl-xhdpi/ic_groups_holo_dark.png
deleted file mode 100644
index 3b2799c..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_groups_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_group_work_black_24dp.png b/res/drawable-mdpi/ic_group_work_black_24dp.png
deleted file mode 100644
index 7182a32..0000000
--- a/res/drawable-mdpi/ic_group_work_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_group_work_black_24dp.png b/res/drawable-xhdpi/ic_group_work_black_24dp.png
deleted file mode 100644
index 8445277..0000000
--- a/res/drawable-xhdpi/ic_group_work_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_group_work_black_24dp.png b/res/drawable-xxhdpi/ic_group_work_black_24dp.png
deleted file mode 100644
index 0cd03cf..0000000
--- a/res/drawable-xxhdpi/ic_group_work_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_group_work_black_24dp.png b/res/drawable-xxxhdpi/ic_group_work_black_24dp.png
deleted file mode 100644
index 632387a..0000000
--- a/res/drawable-xxxhdpi/ic_group_work_black_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/background_holo_light.xml b/res/drawable/background_holo_light.xml
deleted file mode 100644
index 4e863ea..0000000
--- a/res/drawable/background_holo_light.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <gradient
- android:startColor="#ffe8e8e8"
- android:endColor="#ffffffff"
- android:angle="270" />
-</shape>
diff --git a/res/drawable/frame_thumbnail_contact_widget_holo.xml b/res/drawable/frame_thumbnail_contact_widget_holo.xml
deleted file mode 100644
index 9f8edbe..0000000
--- a/res/drawable/frame_thumbnail_contact_widget_holo.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true"
- android:drawable="@drawable/quickcontact_badge_overlay_pressed_light" />
- <item
- android:drawable="@drawable/quickcontact_badge_overlay_normal_light" />
-</selector>
diff --git a/res/drawable/quickcontact_card_border.xml b/res/drawable/quickcontact_card_border.xml
deleted file mode 100644
index f0daea1..0000000
--- a/res/drawable/quickcontact_card_border.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <stroke
- android:width="@dimen/expanding_entry_card_border_width"
- android:color="@color/card_margin_color"/>
-</shape>
diff --git a/res/layout-sw600dp/favorites_star.xml b/res/layout-sw600dp/favorites_star.xml
deleted file mode 100644
index 6c83866..0000000
--- a/res/layout-sw600dp/favorites_star.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.
--->
-
-<!-- The favorite star, shown outside of the ActionBar -->
-<!-- The content description is set in code -->
-<ImageButton
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/star"
- android:layout_width="48dip"
- android:layout_height="48dip"
- android:scaleType="center"
- android:background="?android:attr/selectableItemBackground"
- android:src="@drawable/btn_star_off_normal_holo_light"
- tools:ignore="ContentDescription" />
diff --git a/res/layout/add_group_menu_item.xml b/res/layout/add_group_menu_item.xml
deleted file mode 100644
index 5f95b3f..0000000
--- a/res/layout/add_group_menu_item.xml
+++ /dev/null
@@ -1,32 +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.
--->
-
-<!--
- Custom action bar button for creating new groups. This is a custom view so
- that we can anchor the account list dropdown from this view when creating a group.
--->
-
-<ImageView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_marginRight="8dip"
- android:layout_marginEnd="8dip"
- android:src="@drawable/ic_add_group_holo_dark"
- android:description="@string/menu_new_group_action_bar"
- style="?android:attr/actionButtonStyle" />
diff --git a/res/layout/fragment_test.xml b/res/layout/fragment_test.xml
deleted file mode 100644
index af281eb..0000000
--- a/res/layout/fragment_test.xml
+++ /dev/null
@@ -1,26 +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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
->
- <!-- Placeholder to load the fragment under test. -->
- <fragment android:id="@+id/fragment"
- android:name="com.android.contacts.test.EmptyFragment"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-</FrameLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d8bcd57..da0e528 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -83,14 +83,6 @@
creating a new contact. This string represents the built in way to create the contact. -->
<string name="insertContactDescription">Create contact</string>
- <!-- The description presented to the user in the Intent choose when there are multiple activities that allow
- editing a group. This string represents the built in way to edit the group. [CHAR LIMIT=NONE] -->
- <string name="editGroupDescription">Edit group</string>
-
- <!-- The description presented to the user in the Intent choose when there are multiple activities that allow
- creating a new group. This string represents the built in way to create the group. [CHAR LIMIT=NONE] -->
- <string name="insertGroupDescription">Create group</string>
-
<!-- The tab label for the contact detail activity that displays information about the contact [CHAR LIMIT=15] -->
<string name="contactDetailAbout">About</string>
@@ -300,12 +292,6 @@
<!-- The text displayed when the groups list is empty and no accounts are set on the device while displaying all groups [CHAR LIMIT=NONE] -->
<string name="noAccounts">To create groups you need an account.</string>
- <!-- The text displayed when there are no members in the group while displaying the group detail page [CHAR LIMIT=40] -->
- <string name="emptyGroup">No people in this group.</string>
-
- <!-- The text displayed to instruct users to add members to a group (when viewing a group detail page for a group with no members) [CHAR LIMIT=50] -->
- <string name="addPeopleToGroup">To add some, edit the group.</string>
-
<!-- Displayed in a spinner dialog after the user creates a contact and it's being saved to the database -->
<string name="savingContact">Saving contact\u2026</string>
@@ -598,12 +584,6 @@
<!-- An item in the popup list of groups that triggers creation of a contact group [CHAR LIMIT=128] -->
<string name="create_group_item_label">Create new group</string>
- <!-- Shows how many groups are from the specified account [CHAR LIMIT=15] -->
- <plurals name="num_groups_in_account">
- <item quantity="one">1 group</item>
- <item quantity="other"><xliff:g id="count">%0$d</xliff:g> groups</item>
- </plurals>
-
<!-- Confirmation message of the dialog that allows deletion of a contact group [CHAR LIMIT=256] -->
<string name="delete_group_dialog_message">Delete the group
\"<xliff:g id="group_label" example="Friends">%1$s</xliff:g>\"?
