Make it easier to delete a contact

* Add delete menu item to quickcontact overflow menu
* Promote delete menu item on edit contact activity
  from overflow menu to show as action

Bug 18061876

Change-Id: I3f99e1cd00151b968a157ff818bf977c0be15eb2

7 files changed, 17 insertions, 0 deletions

diff --git a/res/drawable-hdpi/ic_trash_white_24.png b/res/drawable-hdpi/ic_trash_white_24.png
new file mode 100644
index 000000000..86e909905
--- /dev/null
+++ b/res/drawable-hdpi/ic_trash_white_24.png
diff --git a/res/drawable-mdpi/ic_trash_white_24.png b/res/drawable-mdpi/ic_trash_white_24.png
new file mode 100644
index 000000000..fc67992ff
--- /dev/null
+++ b/res/drawable-mdpi/ic_trash_white_24.png
diff --git a/res/drawable-xhdpi/ic_trash_white_24.png b/res/drawable-xhdpi/ic_trash_white_24.png
new file mode 100644
index 000000000..df96462c2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_trash_white_24.png
diff --git a/res/drawable-xxhdpi/ic_trash_white_24.png b/res/drawable-xxhdpi/ic_trash_white_24.png
new file mode 100644
index 000000000..96acd7e9f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_trash_white_24.png
diff --git a/res/menu/quickcontact.xml b/res/menu/quickcontact.xml
index 13caa5962..d1658fcd6 100644
--- a/res/menu/quickcontact.xml
+++ b/res/menu/quickcontact.xml
@@ -26,6 +26,10 @@
         android:showAsAction="always" />
 
     <item
+        android:id="@+id/menu_delete"
+        android:title="@string/menu_deleteContact" />
+
+    <item
         android:id="@+id/menu_share"
         android:title="@string/menu_share"
         android:alphabeticShortcut="s" />
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index ed2520dad..23ea6af73 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -1060,6 +1060,8 @@ public class ContactEditorFragment extends Fragment implements
         final MenuItem sendToVoiceMailMenu = menu.findItem(R.id.menu_send_to_voicemail);
         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);
 
         // Set visibility of menus
         doneMenu.setVisible(false);
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index dbd449419..48eb535ff 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -2137,6 +2137,11 @@ public class QuickContactActivity extends ContactsActivity {
         startActivityForResult(getEditContactIntent(), REQUEST_CODE_CONTACT_EDITOR_ACTIVITY);
     }
 
+    private void deleteContact() {
+        final Uri contactUri = mContactData.getLookupUri();
+        ContactDeletionInteraction.start(this, contactUri, /* finishActivityWhenDone =*/ true);
+    }
+
     private void toggleStar(MenuItem starredMenuItem) {
         // Make sure there is a contact
         if (mContactData != null) {
@@ -2271,6 +2276,9 @@ public class QuickContactActivity extends ContactsActivity {
                 editMenuItem.setVisible(false);
             }
 
+            final MenuItem deleteMenuItem = menu.findItem(R.id.menu_delete);
+            deleteMenuItem.setVisible(isContactEditable());
+
             final MenuItem shareMenuItem = menu.findItem(R.id.menu_share);
             shareMenuItem.setVisible(isContactShareable());
 
@@ -2348,6 +2356,9 @@ public class QuickContactActivity extends ContactsActivity {
                     editContact();
                 }
                 return true;
+            case R.id.menu_delete:
+                deleteContact();
+                return true;
             case R.id.menu_share:
                 shareContact();
                 return true;