summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2014-11-26 12:03:25 -0800
committerBrian Attwell <brianattwell@google.com>2014-11-26 12:03:25 -0800
commit47b17c83b981172bda672314385eb8920753ba25 (patch)
tree024f26507aedb9f7f56f20b80476932f82417f8c
parentb7627801c884c09172ed41c4b4ea52dacb53fb46 (diff)
downloadpackages_apps_Contacts-47b17c83b981172bda672314385eb8920753ba25.tar.gz
packages_apps_Contacts-47b17c83b981172bda672314385eb8920753ba25.tar.bz2
packages_apps_Contacts-47b17c83b981172bda672314385eb8920753ba25.zip
Use delete icon from go/icons
Bug: 18004959 Change-Id: Ia8a5fe6006f6caf313a0f2eb044a94535c43878c
-rw-r--r--res/drawable-hdpi/ic_delete_white_24dp.pngbin0 -> 161 bytes
-rw-r--r--res/drawable-hdpi/ic_trash_white_24.pngbin290 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_delete_white_24dp.pngbin0 -> 115 bytes
-rw-r--r--res/drawable-mdpi/ic_trash_white_24.pngbin201 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_delete_white_24dp.pngbin0 -> 151 bytes
-rw-r--r--res/drawable-xhdpi/ic_trash_white_24.pngbin339 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_delete_white_24dp.pngbin0 -> 194 bytes
-rw-r--r--res/drawable-xxhdpi/ic_trash_white_24.pngbin517 -> 0 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_delete_white_24dp.pngbin0 -> 243 bytes
-rw-r--r--src/com/android/contacts/editor/ContactEditorFragment.java2
10 files changed, 1 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_delete_white_24dp.png b/res/drawable-hdpi/ic_delete_white_24dp.png
new file mode 100644
index 000000000..4a9f76947
--- /dev/null
+++ b/res/drawable-hdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_trash_white_24.png b/res/drawable-hdpi/ic_trash_white_24.png
deleted file mode 100644
index 86e909905..000000000
--- a/res/drawable-hdpi/ic_trash_white_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_delete_white_24dp.png b/res/drawable-mdpi/ic_delete_white_24dp.png
new file mode 100644
index 000000000..e2f5f3555
--- /dev/null
+++ b/res/drawable-mdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_trash_white_24.png b/res/drawable-mdpi/ic_trash_white_24.png
deleted file mode 100644
index fc67992ff..000000000
--- a/res/drawable-mdpi/ic_trash_white_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_delete_white_24dp.png b/res/drawable-xhdpi/ic_delete_white_24dp.png
new file mode 100644
index 000000000..388b5b060
--- /dev/null
+++ b/res/drawable-xhdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_trash_white_24.png b/res/drawable-xhdpi/ic_trash_white_24.png
deleted file mode 100644
index df96462c2..000000000
--- a/res/drawable-xhdpi/ic_trash_white_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_delete_white_24dp.png b/res/drawable-xxhdpi/ic_delete_white_24dp.png
new file mode 100644
index 000000000..3fcdfdb55
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_trash_white_24.png b/res/drawable-xxhdpi/ic_trash_white_24.png
deleted file mode 100644
index 96acd7e9f..000000000
--- a/res/drawable-xxhdpi/ic_trash_white_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/res/drawable-xxxhdpi/ic_delete_white_24dp.png
new file mode 100644
index 000000000..8d322aa9b
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index ac8a6418d..9de8faef8 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -1058,7 +1058,7 @@ public class ContactEditorFragment extends Fragment implements
final MenuItem ringToneMenu = menu.findItem(R.id.menu_set_ringtone);
final MenuItem deleteMenu = menu.findItem(R.id.menu_delete);
deleteMenu.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
- deleteMenu.setIcon(R.drawable.ic_trash_white_24);
+ deleteMenu.setIcon(R.drawable.ic_delete_white_24dp);
// Set visibility of menus
doneMenu.setVisible(false);