diff options
| author | Brian Muramatsu <btmura@google.com> | 2012-09-18 14:59:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-18 14:59:36 -0700 |
| commit | a6c1b346ae0fc92170eb09f90c71b9c3d25d53eb (patch) | |
| tree | 2cd790947b56931842a3bc2bd8ba9864ca4d367e /res/values | |
| parent | 7956e7263afd2007dc4262dc3c79dc74b14e8bf6 (diff) | |
| parent | a6dbaea2dacaaef7c91f89aae8d5f1ed7580b893 (diff) | |
| download | packages_apps_settings-a6c1b346ae0fc92170eb09f90c71b9c3d25d53eb.zip packages_apps_settings-a6c1b346ae0fc92170eb09f90c71b9c3d25d53eb.tar.gz packages_apps_settings-a6c1b346ae0fc92170eb09f90c71b9c3d25d53eb.tar.bz2 | |
Merge "Add optional regulatory info page" into jb-mr1-dev
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/bools.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/res/values/bools.xml b/res/values/bools.xml index 23bdf0d..ba402e5 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -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> diff --git a/res/values/strings.xml b/res/values/strings.xml index 233963c..e08cdeb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -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> |