Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add UI for mainline modules licenses." into qt-dev am: 72aded338a

Browse Source 
am: 0c1f7da25a

Change-Id: I7e3ce8019cc4a411dec6ebf72b8518e1026ed73d
This commit is contained in:
Andrew Sapperstein
2019-06-28 10:47:58 -07:00
committed by android-build-merger
parent 27424848e8 0c1f7da25a
commit 722f8c0ac1
15 changed files with 1239 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/xml/about_legal.xml
View File

@@ -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"

28
res/xml/module_licenses.xml Normal file
View File

@@ -0,0 +1,28 @@
<?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>