commit 8753906a4eb4223bfbdec77a5baac25b79b88434
author Walter Jang <wjang@google.com> Wed Sep 09 19:16:43 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 09 19:16:43 2015 +0000
tree 68755f18416c943745a6c3d6f9532558877a6110
parent 82ed2b5380e134705f96e7e1f1586a25f8ac403f
parent 953cea238c9969fd7703fbce2bf8a915b5c38955

Merge "Don't show aggregation suggestion for new me contacts" into ub-contactsdialer-a-dev

src/com/android/contacts/editor/ContactEditorBaseFragment.java

diff --git a/src/com/android/contacts/editor/ContactEditorBaseFragment.java b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
index c030509..b5d0e9a 100644
--- a/src/com/android/contacts/editor/ContactEditorBaseFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
@@ -790,7 +790,7 @@
                     && !isSingleReadOnlyContact);
             // Cannot join a user profile
             joinMenu.setVisible(!isEditingUserProfile());
-            deleteMenu.setVisible(!mDisableDeleteMenuOption);
+            deleteMenu.setVisible(!mDisableDeleteMenuOption && !isEditingUserProfile());
         } else {
             // something else, so don't show the help menu
             helpMenu.setVisible(false);

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 64d8aec..8bb6976 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -2396,7 +2396,7 @@
             }
 
             final MenuItem deleteMenuItem = menu.findItem(R.id.menu_delete);
-            deleteMenuItem.setVisible(isContactEditable());
+            deleteMenuItem.setVisible(isContactEditable() && !mContactData.isUserProfile());
 
             final MenuItem shareMenuItem = menu.findItem(R.id.menu_share);
             shareMenuItem.setVisible(isContactShareable());