Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b674329 authored by Tingting Wang's avatar Tingting Wang Committed by android-build-merger
Browse files

Merge "Read metadataSyncEnabled flag from N sdk." into ub-contactsdialer-b-dev am: 3f1fa5480a 

am: 56d29e8ace

* commit '56d29e8ace109ca377e10e6e1a0bffac255dbd34':
  Read metadataSyncEnabled flag from N sdk.
parents 29f3ba31 e23434e6

res-common/values/strings.xml

+5 −2
Original line number Diff line number Diff line
@@ -669,8 +669,11 @@ a ren't members of any other group. [CHAR LIMIT=25] --> 
    <!--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>

res-common/xml/preference_display_options.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"