commit 31599988150efb64e4e355c5d228a05a0f2aabed
author Walter Jang <wjang@google.com> Tue Jun 02 22:02:58 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 02 22:03:01 2015 +0000
tree 3fcf398a2253dd660cb555b3977af94836fc6b13
parent 3c4d041b925bd45da88d20a88f819b8d02ef9aa5
parent a35ef54b651d17536169bb0ba0423ca5ef2839b4

Merge "Don't allow newly writable contact splits" into mnc-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 52076f7..d0750e0 100644
--- a/src/com/android/contacts/editor/ContactEditorBaseFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
@@ -754,8 +754,9 @@
         } else if (Intent.ACTION_EDIT.equals(mAction) ||
                 ContactEditorBaseActivity.ACTION_EDIT.equals(mAction)) {
             HelpUtils.prepareHelpMenuItem(mContext, helpMenu, R.string.help_url_people_edit);
-            // Split only if more than one raw profile and not a user profile
-            splitMenu.setVisible(mState.size() > 1 && !isEditingUserProfile());
+            // Split only if there is more than one raw (non-user profile) contact and doing so
+            // won't result in an empty contact
+            splitMenu.setVisible(mState.size() > 1 && !isEditingUserProfile() && !mHasNewContact);
             // Cannot join a user profile
             joinMenu.setVisible(!isEditingUserProfile());
             deleteMenu.setVisible(!mDisableDeleteMenuOption);