am 52200870: Merge "Use delete icon from go/icons" into lmp-mr1-dev
* commit '522008701c63fb33558c4b4d6809be0dbd661ef9':
Use delete icon from go/icons
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 0000000..4a9f769
--- /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 86e9099..0000000
--- 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 0000000..e2f5f35
--- /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 fc67992..0000000
--- 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 0000000..388b5b0
--- /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 df96462..0000000
--- 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 0000000..3fcdfdb
--- /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 96acd7e..0000000
--- 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 0000000..8d322aa
--- /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 ac8a641..9de8fae 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -1058,7 +1058,7 @@
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);
