Changing layout and behavior of aggregation suggestions.

Bug: 3098963

Change-Id: I50c8d56bf97b1af15200ce416afc6810899f16d7
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 49a4186..84f1db1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1303,19 +1303,23 @@
     <!-- The name of the invisible local contact directory -->
     <string name="local_invisible_directory">Other</string>
 
-    <!-- The heading of the contact aggregation suggestions section in Contact editor. [CHAR LIMIT=128]-->
-    <plurals name="aggregation_suggestion_title">
-        <item quantity="one">Similar contact</item>
-        <item quantity="other">Similar contacts</item>
-    </plurals>
+    <!-- The title of a confirmation dialog shown when the user selects a
+        contact aggregation suggestion in Contact editor. [CHAR LIMIT=128]-->
+    <string name="aggregation_suggestion_join_dialog_title">Join contacts</string>
 
-    <!-- The heading of the aggregation suggestion section of the Contact editor
-        indicating the contact that will be joined with the current contact. [CHAR LIMIT=128]-->
-    <string name="aggregation_suggestion_joined_title">Joined contact:</string>
+    <!-- The message in a confirmation dialog shown when the user selects a
+        contact aggregation suggestion in Contact editor. [CHAR LIMIT=512]-->
+    <string name="aggregation_suggestion_join_dialog_message">Join
+        the current contact with the selected contact?</string>
 
-    <!-- The button next to a contact aggregation suggestion in Contact editor. Causes a logical
-      join with the suggested contact. [CHAR LIMIT=12]-->
-    <string name="aggregation_suggestion_join_button">Join</string>
+    <!-- The title of a confirmation dialog shown when the user selects a
+        contact aggregation suggestion in Contact editor. [CHAR LIMIT=128]-->
+    <string name="aggregation_suggestion_edit_dialog_title">Edit selected contacts</string>
+
+    <!-- The message in a confirmation dialog shown when the user selects a 
+        contact aggregation suggestion in Contact editor. [CHAR LIMIT=512]-->
+    <string name="aggregation_suggestion_edit_dialog_message">Switch to editing
+        the selected contact? Information you entered so far will be copied.</string>
 
     <!-- The button next to a contact aggregation suggestion in Contact editor. Causes the UI
     to switch to the suggested contact in the editor. [CHAR LIMIT=12]-->