Follow changes to RestrictionEntry API

Implement custom restrictions activity.
Fixed some bugs.

Change-Id: I094a6ffcc41c2936f76a8731048d7cb712c1b857
This commit is contained in:
Amith Yamasani
2013-03-28 14:34:36 -07:00
parent a864530969
commit 6e4757f0a6
4 changed files with 152 additions and 53 deletions

View File

@@ -4414,6 +4414,27 @@
<string name="user_restrictions_title">Allow apps and content</string>
<!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
<string name="user_rename">RENAME</string>
<!-- Preference label for custom restrictions [CHAR LIMIT=35] -->
<string name="app_restrictions_custom_label">Set application limits</string>
<!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
<string name="restriction_wifi_config_title">Wi\u2011Fi and Mobile</string>
<!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
<string name="restriction_wifi_config_summary">Allow modification of Wi\u2011Fi and Mobile settings</string>
<!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
<string name="restriction_bluetooth_config_title">Bluetooth</string>
<!-- Restrictions summary for changing bluetooth configuration [CHAR LIMIT=100] -->
<string name="restriction_bluetooth_config_summary">Allow modification of Bluetooth pairings and settings</string>
<!-- Restrictions title for allowing NFC transfers [CHAR LIMIT=35] -->
<string name="restriction_nfc_enable_title">NFC</string>
<!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
<string name="restriction_nfc_enable_summary" product="tablet">Allow data exchange when the tablet touches another device</string>
<!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
<string name="restriction_nfc_enable_summary" product="default">Allow data exchange when the phone touches another device</string>
<!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
<string name="restriction_location_enable_title">NFC</string>
<!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
<string name="restriction_location_enable_summary" >Let apps use your location information</string>
<!-- Wizard back button label [CHAR LIMIT=25] -->
<string name="wizard_back">Back</string>