Add "Accounts" and "Add account" to Settings.

BUG 29184035

Change-Id: I460b1f0d51d29895d86f60cda997e14c8ceee04e
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index a97819f..8f9265b 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -601,6 +601,12 @@
     <!-- An allowable value for the "view names as" contact display option  -->
     <string name="display_options_view_family_name_first">Last name first</string>
 
+    <!--Lable of the "Accounts" in settings [CHAR LIMIT=30]-->
+    <string name="settings_accounts">Accounts</string>
+
+    <!--Lable of the "Add account" in Accounts settings [CHAR LIMIT=60]-->
+    <string name="add_account_label">Add account</string>
+
     <!--Label of the "default account" setting option to set default editor account. [CHAR LIMIT=80]-->
     <string name="default_editor_account">Default account for new contacts</string>
 
diff --git a/res-common/xml/preference_accounts.xml b/res-common/xml/preference_accounts.xml
new file mode 100644
index 0000000..3f5c8fd
--- /dev/null
+++ b/res-common/xml/preference_accounts.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+            android:icon="@null"
+            android:key="addAccount"
+            android:title="@string/add_account_label"/>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res-common/xml/preference_display_options.xml b/res-common/xml/preference_display_options.xml
index 6173b64..a6bfefe 100644
--- a/res-common/xml/preference_display_options.xml
+++ b/res-common/xml/preference_display_options.xml
@@ -20,9 +20,15 @@
         android:key="myInfo"
         android:title="@string/settings_my_info_title"/>
 
-    <com.android.contacts.common.preference.DefaultAccountPreference
+    <Preference
         android:icon="@null"
         android:key="accounts"
+        android:title="@string/settings_accounts">
+    </Preference>
+
+    <com.android.contacts.common.preference.DefaultAccountPreference
+        android:icon="@null"
+        android:key="defaultAccount"
         android:title="@string/default_editor_account"
         android:dialogTitle="@string/default_editor_account" />