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

Merge "Allow manual to be read from disk" into mnc-dr-dev

Browse Source
This commit is contained in:
Zach Kuznia
2015-10-01 00:08:05 +00:00
committed by Android (Google) Code Review
parent 1207a50100 5adcb3d353
commit ae8aea76e5
6 changed files with 118 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/bools.xml
View File

@@ -30,6 +30,8 @@
Can be overridden for specific product builds. -->
<bool name="auto_confirm_bluetooth_activation_dialog">false</bool>
<!-- Whether to show a preference item for the manual in About phone -->
<bool name="config_show_manual">false</bool>
<!-- Whether to show a preference item for regulatory information in About phone -->
<bool name="config_show_regulatory_info">false</bool>

7
res/values/strings.xml
View File

@@ -2880,6 +2880,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 Manual [CHAR LIMIT=25] -->
<string name="manual">Manual</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 />
@@ -2899,6 +2901,11 @@
<!-- About phone settings screen, setting option name to see wallpapers attributions values -->
<string name="wallpaper_attributions_values">Satellite imagery providers:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky</string>
<!-- Phone Manual -->
<string name="settings_manual_activity_title">Manual</string>
<!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
<string name="settings_manual_activity_unavailable">There is a problem loading the manual.</string>
<!-- Title for actual Settings license activity. --> <skip />
<!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
<string name="settings_license_activity_title">Open source licenses</string>