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

Commit 647f6850 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

Merge "Add UI for mainline modules licenses." into qt-dev 

am: 72aded33

Change-Id: I93faf2c99489405fe82a75adf24f4d885bbe1558
parents f6972b29 72aded33

AndroidManifest.xml

+18 −0
Original line number Diff line number Diff line
@@ -986,6 +986,18 @@ 
                android:value="true" />

        </activity>



        <activity android:name=".Settings$ModuleLicensesActivity"

                  android:label="@string/module_license_title">

            <intent-filter>

                <action android:name="android.settings.MODULE_LICENSES" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.deviceinfo.legal.ModuleLicensesDashboard" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>



        <activity

            android:name="Settings$ManageApplicationsActivity"

            android:label="@string/applications_settings">
@@ -2663,6 +2675,12 @@ 
                android:resource="@xml/file_paths" />

        </provider>



        <provider

            android:name=".deviceinfo.legal.ModuleLicenseProvider"

            android:authorities="com.android.settings.module_licenses"

            android:grantUriPermissions="true"

            android:exported="false"/>



        <activity android:name=".sim.SimPreferenceDialog"

            android:theme="@style/Theme.AlertDialog"

            android:excludeFromRecents="true" />

res/xml/about_legal.xml

+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,13 @@ 
        android:title="@string/terms_title"

        settings:controller="com.android.settings.deviceinfo.legal.TermsPreferenceController" />



    <!-- Mainline Module License information -->

    <Preference

        android:key="module_license"

        android:title="@string/module_license_title"

        android:fragment="com.android.settings.deviceinfo.legal.ModuleLicensesDashboard"

        settings:controller="com.android.settings.deviceinfo.legal.ModuleLicensesListPreferenceController" />



    <!-- System WebView License information -->

    <Preference

        android:key="webview_license"

res/xml/module_licenses.xml

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

<!--

  ~ Copyright (C) 2019 The Android Open Source Project

  ~

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

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

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<PreferenceScreen

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

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

    android:key="module_licenses"

    android:title="@string/module_license_title">

    <PreferenceCategory

        android:key="module_licenses_category"

        android:layout="@layout/preference_category_no_label"

        android:title="@string/summary_placeholder"

        settings:controller="com.android.settings.deviceinfo.legal.ModuleLicensesPreferenceController" />

</PreferenceScreen>

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public class Settings extends SettingsActivity { 
    public static class NightDisplaySettingsActivity extends SettingsActivity { /* empty */ }

    public static class NightDisplaySuggestionActivity extends NightDisplaySettingsActivity { /* empty */ }

    public static class MyDeviceInfoActivity extends SettingsActivity { /* empty */ }

    public static class ModuleLicensesActivity extends SettingsActivity { /* empty */ }

    public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }

    public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }

    public static class ManageAssistActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/core/gateway/SettingsGateway.java

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import com.android.settings.deviceinfo.StorageDashboardFragment; 
import com.android.settings.deviceinfo.StorageSettings;

import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;

import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings;

import com.android.settings.deviceinfo.legal.ModuleLicensesDashboard;

import com.android.settings.display.NightDisplaySettings;

import com.android.settings.dream.DreamSettings;

import com.android.settings.enterprise.EnterprisePrivacySettings;
@@ -175,6 +176,7 @@ public class SettingsGateway { 
            UserDictionarySettings.class.getName(),

            DisplaySettings.class.getName(),

            MyDeviceInfoFragment.class.getName(),

            ModuleLicensesDashboard.class.getName(),

            ManageApplications.class.getName(),

            FirmwareVersionSettings.class.getName(),

            ManageAssist.class.getName(),
@@ -318,6 +320,7 @@ public class SettingsGateway { 
            Settings.DateTimeSettingsActivity.class.getName(),

            Settings.EnterprisePrivacySettingsActivity.class.getName(),

            Settings.MyDeviceInfoActivity.class.getName(),

            Settings.ModuleLicensesActivity.class.getName(),

            UserBackupSettingsActivity.class.getName(),

    };

}