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

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

Add open source license html file to Setting->About. 

am: ab78c12bee

* commit 'ab78c12beee8b747b5a16002d900d42617c66ee5':
  Add open source license html file to Setting->About.
parents d258e80b e67257a7

res-common/layout/licenses.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 2015 Google Inc. All Rights Reserved. -->



<WebView

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

        android:id="@+id/webview"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

</WebView>
 
 No newline at end of file

res-common/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -816,4 +816,7 @@ a ren't members of any other group. [CHAR LIMIT=25] --> 


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

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



    <!-- Title for the activity that displays licenses for open source libraries. [CHAR LIMIT=100]-->

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

</resources>

res-common/xml/preference_display_options.xml

+5 −5
Original line number Diff line number Diff line
@@ -42,26 +42,26 @@ 
                android:key="@string/pref_build_version_key"

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



        <PreferenceScreen

        <Preference

                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

        <Preference

                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>

        </Preference>



        <PreferenceScreen

        <Preference

                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>

        </Preference>

    </PreferenceScreen>

</PreferenceScreen>