Merge "Read metadataSyncEnabled flag from N sdk." into ub-contactsdialer-b-dev
am: 3f1fa5480a
* commit '3f1fa5480ae4eb469900c8c78b6429712b7a2b69':
Read metadataSyncEnabled flag from N sdk.
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index 48e7146..ef7dbc7 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -669,8 +669,11 @@
<!--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 "Sync contact metadata" setting option to set sync account for Lychee. [CHAR LIMIT=80]-->
+ <string name="sync_contact_metadata_title">Sync contact metadata [DOGFOOD]</string>
+
+ <!--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>
<!-- 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 ba73a3c..9e7a594 100644
--- a/res-common/xml/preference_display_options.xml
+++ b/res-common/xml/preference_display_options.xml
@@ -36,8 +36,8 @@
<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" />
+ android:title="@string/sync_contact_metadata_title"
+ android:dialogTitle="@string/sync_contact_metadata_dialog_title" />
<PreferenceScreen
android:icon="@null"