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

Commit 8f2a7cee authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'v1-oreo-sprint_istanbul' into 'v1-oreo' 

[RELEASE] Sprint Istanbul

See merge request !12
parents 354a2b37 738c39e8

res/values/strings.xml

+8 −0
Original line number Original line Diff line number Diff line
@@ -1589,4 +1589,12 @@ 
    <!--Explanation with icon of Drawer in Contacts. Your medical information ie. Date of birth, Bloodtype, allergic details can be recorded for reference. -->

    <!--Explanation with icon of Drawer in Contacts. Your medical information ie. Date of birth, Bloodtype, allergic details can be recorded for reference. -->

    <string name="menu_emergency_information_txt">Emergency information</string>

    <string name="menu_emergency_information_txt">Emergency information</string>





    <string name="preferences_about_app">Contacts is forked from LineageOS Contacts</string>

    <string name="preferences_authors">Authors</string>

    <string name="preferences_source_code">Source code</string>

    <string name="preferences_licence">Licence</string>

    <string name="preferences_app_info_title">Contact information</string>

    <string name="preferences_app_info">-Contacts is an open source App for Android</string>





</resources>
 
</resources>

res/xml/preference_about.xml

+54 −16
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2016 The Android Open Source Project

<!-- Copyright (C) 2016 The Android Open Source Project





     Licensed under the Apache License, Version 2.0 (the "License");

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     you may not use this file except in compliance with the License.
@@ -15,26 +14,65 @@ 
-->

-->





<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">



    <Preference

        android:key="contacts_info"

        android:summary="@string/preferences_app_info"

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



    <Preference

    <Preference

        android:icon="@null"

        android:icon="@null"

        android:key="@string/pref_build_version_key"

        android:key="@string/pref_build_version_key"

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

        android:title="@string/about_build_version">



        <intent

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

            android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/releases" />



    </Preference>



    <Preference

        android:key="about_app"

        android:title="@string/preferences_about_app">



        <intent

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

            android:data="https://github.com/LineageOS/android_packages_apps_Contacts" />



    </Preference>



    <Preference android:title="@string/preferences_licence">

        <intent

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

            android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts/-/blob/v1-oreo/NOTICE" />

    </Preference>



    <Preference android:title="@string/preferences_authors">

        <intent

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

            android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts" />

    </Preference>



    <Preference android:title="@string/preferences_source_code">

        <intent

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

            android:data="https://gitlab.e.foundation/e/os/android_packages_apps_Contacts" />

    </Preference>







    <Preference

    <Preference

        android:icon="@null"

        android:icon="@null"

        android:key="@string/pref_open_source_licenses_key"

        android:key="@string/pref_open_source_licenses_key"

            android:title="@string/about_open_source_licenses"

        android:summary="@string/about_open_source_licenses_summary"

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

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





    <Preference

    <Preference

        android:icon="@null"

        android:icon="@null"

        android:key="@string/pref_privacy_policy_key"

        android:key="@string/pref_privacy_policy_key"

            android:title="@string/about_privacy_policy">

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

    </Preference>





    <Preference

    <Preference

        android:icon="@null"

        android:icon="@null"

        android:key="@string/pref_terms_of_service_key"

        android:key="@string/pref_terms_of_service_key"

            android:title="@string/about_terms_of_service">

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

    </Preference>

</PreferenceScreen>
 
</PreferenceScreen>

src/com/android/contacts/preference/AboutPreferenceFragment.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -35,8 +35,9 @@ import com.android.contacts.activities.LicenseActivity; 
 */

 */

public class AboutPreferenceFragment extends PreferenceFragment {

public class AboutPreferenceFragment extends PreferenceFragment {





    public static final String PRIVACY_POLICY_URL = "http://www.google.com/policies/privacy";

    public static final String PRIVACY_POLICY_URL = "https://e.foundation/legal-notice-privacy/";

    public static final String TERMS_OF_SERVICE_URL = "http://www.google.com/policies/terms";

    public static final String TERMS_OF_SERVICE_URL = "https://e.foundation/legal-notice-privacy/";







    public static AboutPreferenceFragment newInstance() {

    public static AboutPreferenceFragment newInstance() {

        return new AboutPreferenceFragment();

        return new AboutPreferenceFragment();