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

Commit a6c1b346 authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android (Google) Code Review
Browse files

Merge "Add optional regulatory info page" into jb-mr1-dev

parents 7956e726 a6dbaea2
Loading
Loading
Loading
Loading
+159 B
Loading image diff...
+19 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2012 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.
-->
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:src="@drawable/regulatory_info"/>
+3 −0
Original line number Diff line number Diff line
@@ -32,4 +32,7 @@

    <!-- Whether User management screen is available -->
    <bool name="enable_user_management">false</bool>

    <!-- Whether to show a preference item for regulatory information in About phone -->
    <bool name="config_show_regulatory_info">false</bool>
</resources>
+2 −0
Original line number Diff line number Diff line
@@ -2237,6 +2237,8 @@
    <string name="legal_information">Legal information</string>
    <!-- About phone settings screen, setting option name to see a list of contributors -->
    <string name="contributors_title">Contributors</string>
    <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
    <string name="regulatory_information">Regulatory information</string>
    <!-- Note: this may be replaced by a more-specific title of the activity that will get launched --> <skip />
    <!-- About phone settings screen, setting option name to see copyright-related info -->
    <string name="copyright_title">Copyright</string>
+5 −1
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@
        </PreferenceScreen>
        -->

        <Preference android:key="regulatory_info"
                android:title="@string/regulatory_information"
                android:fragment="com.android.settings.RegulatoryInfoFragment"/>

        <!-- Device hardware model -->
        <Preference android:key="device_model" 
                style="?android:preferenceInformationStyle"
Loading