commit 13aede84cf83a9fb4bfb2f28eb77429b3b43169d
author Wenyi Wang <wenyiw@google.com> Mon Oct 26 13:28:34 2015 -0700
committer Wenyi Wang <wenyiw@google.com> Mon Oct 26 13:42:35 2015 -0700
tree 90372f0108fa17cb6f8c726d2580e123e75896eb
parent 33f60d35a16407868de09ca898028e5eca6c6de3

Use string "Contacts unlinked" when unlinking

Also removed the period in "Contact saved."

Bug: 25231225
Change-Id: I95908809b144911ced124ea52abe5d6cdece3774

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 20c4419..5416672 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -271,7 +271,10 @@
     <string name="savingContact">Saving contact\u2026</string>
 
     <!-- Toast displayed when a contact is saved [CHAR LIMIT=NONE] -->
-    <string name="contactSavedToast">Contact saved.</string>
+    <string name="contactSavedToast">Contact saved</string>
+
+    <!-- Toast displayed when linked contacts get unlinked [CHAR LIMIT=NONE] -->
+    <string name="contactUnlinkedToast">Contacts unlinked</string>
 
     <!-- Toast displayed when saving a contact failed. [CHAR LIMIT=NONE] -->
     <string name="contactSavedErrorToast">Couldn\'t save contact changes.</string>

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 b091249..06cce1a 100644
--- a/src/com/android/contacts/editor/ContactEditorBaseFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
@@ -1405,9 +1405,18 @@
             Uri contactLookupUri) {
         if (hadChanges) {
             if (saveSucceeded) {
-                if (saveMode != SaveMode.JOIN) {
-                    Toast.makeText(mContext, R.string.contactSavedToast, Toast.LENGTH_SHORT).show();
+                switch (saveMode) {
+                    case SaveMode.JOIN:
+                        break;
+                    case SaveMode.SPLIT:
+                        Toast.makeText(mContext, R.string.contactUnlinkedToast, Toast.LENGTH_SHORT)
+                                .show();
+                        break;
+                    default:
+                        Toast.makeText(mContext, R.string.contactSavedToast, Toast.LENGTH_SHORT)
+                                .show();
                 }
+
             } else {
                 Toast.makeText(mContext, R.string.contactSavedErrorToast, Toast.LENGTH_LONG).show();
             }