Move "Me Contact" into Settings

- Whatever happens today when you tap on the Me Contact, we
  leave it as is.
- Move DefaultAccountPreference up per UX.

Bug 28541872

Change-Id: I7c8cbc62e5b162e392f7d34ba2c2acad969b62a9
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index 5ffd8f6..f06fdb8 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -610,6 +610,15 @@
     <!--Label of the "Sync contact metadata" setting dialog to set sync account for Lychee. [CHAR LIMIT=80]-->
     <string name="sync_contact_metadata_dialog_title">Sync contact metadata</string>
 
+    <!-- Title of my info preference, showing the name of user's personal profile [CHAR LIMIT=30]-->
+    <string name="settings_my_info_title">My info</string>
+
+    <!-- Displayed below my info for user to set up the user's personal profile entry [CHAR LIMIT=64] -->
+    <string name="set_up_profile">Set up your profile</string>
+
+    <!-- Displayed below my info to show the name of user's personal profile [CHAR LIMIT=30]-->
+    <string name="me_contact_name">Me Contact\u003A\u0020<xliff:g id="name">%s</xliff:g></string>
+
     <!-- Label of the "About" setting -->
     <string name="setting_about">About Contacts</string>
 
@@ -660,9 +669,6 @@
     <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when "All contacts" is selected  [CHAR LIMIT=64]-->
     <string name="listTotalAllContactsZero">No contacts.</string>
 
-    <!-- Displayed at the top of the contacts showing the zero total number of contacts visible when a group or account is selected  [CHAR LIMIT=64]-->
-    <string name="listTotalAllContactsZeroGroup">No contacts in <xliff:g id="name" example="Friends">%s</xliff:g></string>
-
     <!--  The menu item to clear frequents [CHAR LIMIT=30] -->
     <string name="menu_clear_frequents">Clear frequents</string>
 
diff --git a/res-common/xml/preference_display_options.xml b/res-common/xml/preference_display_options.xml
index 632850f..ce30d6d 100644
--- a/res-common/xml/preference_display_options.xml
+++ b/res-common/xml/preference_display_options.xml
@@ -15,6 +15,17 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+        android:icon="@null"
+        android:key="myInfo"
+        android:title="@string/settings_my_info_title"/>
+
+    <com.android.contacts.common.preference.DefaultAccountPreference
+        android:icon="@null"
+        android:key="accounts"
+        android:title="@string/default_editor_account"
+        android:dialogTitle="@string/default_editor_account" />
+
     <com.android.contacts.common.preference.SortOrderPreference
         android:icon="@null"
         android:key="sortOrder"
@@ -27,12 +38,6 @@
         android:title="@string/display_options_view_names_as"
         android:dialogTitle="@string/display_options_view_names_as" />
 
-    <com.android.contacts.common.preference.DefaultAccountPreference
-        android:icon="@null"
-        android:key="accounts"
-        android:title="@string/default_editor_account"
-        android:dialogTitle="@string/default_editor_account" />
-
     <Preference
         android:icon="@null"
         android:key="about"