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

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

Merge "Add About Settings in Contacts App. (1)" into ub-contactsdialer-a-dev 

am: 6778af6484

* commit '6778af6484aeff74cb5d7d699585eb34f1c4576a':
  Add About Settings in Contacts App. (1)
parents af158410 066f2f73

res-common/values/donottranslate_config.xml

+4 −0
Original line number Diff line number Diff line
@@ -86,4 +86,8 @@ 
    <!-- Flag indicating whether Contacts app is allowed to share contacts with devices outside -->

    <bool name="config_allow_share_visible_contacts">true</bool>



    <string name="pref_build_version_key">pref_build_version</string>

    <string name="pref_open_source_licenses_key">pref_open_source_licenses</string>

    <string name="pref_privacy_policy_key">pref_privacy_policy</string>

    <string name="pref_terms_of_service_key">pref_terms_of_service</string>

</resources>

res-common/values/strings.xml

+18 −0
Original line number Diff line number Diff line
@@ -663,6 +663,9 @@ 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 "About" setting -->

    <string name="setting_about">About</string>



    <!-- Action that shares visible contacts -->

    <string name="share_visible_contacts">Share visible contacts</string>
@@ -798,4 +801,19 @@ a ren't members of any other group. [CHAR LIMIT=25] --> 
            <xliff:g id="title">%1$s</xliff:g>. <xliff:g id="count">%2$d</xliff:g> unread items.

        </item>

    </plurals>



    <!-- Build version title in About preference. [CHAR LIMIT=40]-->

    <string name="about_build_version">Build version</string>



    <!-- Open source licenses title in About preference. [CHAR LIMIT=60] -->

    <string name="about_open_source_licenses">Open source licenses</string>



    <!-- Open source licenses summary in About preference. [CHAR LIMIT=NONE] -->

    <string name="about_open_source_licenses_summary">License details for open source software</string>



    <!-- Privacy policy title in About preference. [CHAR LIMIT=40]-->

    <string name="about_privacy_policy">Privacy policy</string>



    <!-- Terms of service title in about preference. [CHAR LIMIT=60]-->

    <string name="about_terms_of_service">Terms of service</string>

</resources>

res-common/xml/preference_display_options.xml

+32 −0
Original line number Diff line number Diff line
@@ -32,4 +32,36 @@ 
        android:key="accounts"

        android:title="@string/default_editor_account"

        android:dialogTitle="@string/default_editor_account" />



    <PreferenceScreen

        android:icon="@null"

        android:key="about"

        android:title="@string/setting_about">

        <Preference

                android:icon="@null"

                android:key="@string/pref_build_version_key"

                android:title="@string/about_build_version"/>



        <PreferenceScreen

                android:icon="@null"

                android:key="@string/pref_open_source_licenses_key"

                android:title="@string/about_open_source_licenses"

                android:summary="@string/about_open_source_licenses_summary"/>



        <PreferenceScreen

                android:icon="@null"

                android:key="@string/pref_privacy_policy_key"

                android:title="@string/about_privacy_policy">

            <intent android:action="android.intent.action.VIEW"

                    android:data="http://www.google.com/policies/privacy" />

        </PreferenceScreen>



        <PreferenceScreen

                android:icon="@null"

                android:key="@string/pref_terms_of_service_key"

                android:title="@string/about_terms_of_service">

            <intent android:action="android.intent.action.VIEW"

                    android:data="http://www.google.com/policies/terms" />

        </PreferenceScreen>

    </PreferenceScreen>

</PreferenceScreen>