PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brian Muramatsu
2012-09-18 14:59:35 -07:00
committed by Android (Google) Code Review
parent 7956e7263a a6dbaea2da
commit a6c1b346ae
7 changed files with 82 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/bools.xml
View File

@@ -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
res/values/strings.xml
View File

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