Merge "Add turn on/off setting for Lychee in Contacts App." into ub-contactsdialer-b-dev
am: 7750ba14da
* commit '7750ba14dacd906286029da2aab46c0b754e2d55':
Add turn on/off setting for Lychee in Contacts App.
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index 6d7518e..48e7146 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -669,6 +669,9 @@
<!--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>
+ <!--Label of the "Contact metadata sync account" setting option to set sync account for Lychee. [CHAR LIMIT=80]-->
+ <string name="contact_metadata_sync_account">Contact metadata sync account</string>
+
<!-- Label of the "About" setting -->
<string name="setting_about">About Contacts</string>
diff --git a/res-common/xml/preference_display_options.xml b/res-common/xml/preference_display_options.xml
index f4befc0..ba73a3c 100644
--- a/res-common/xml/preference_display_options.xml
+++ b/res-common/xml/preference_display_options.xml
@@ -33,6 +33,12 @@
android:title="@string/default_editor_account"
android:dialogTitle="@string/default_editor_account" />
+ <com.android.contacts.common.preference.ContactMetadataSyncAccountPreference
+ android:icon="@null"
+ android:key="contactMetadata"
+ android:title="@string/contact_metadata_sync_account"
+ android:dialogTitle="@string/contact_metadata_sync_account" />
+
<PreferenceScreen
android:icon="@null"
android:key="about"