am 6bcd506f: am e4e607a3: am 1a0297c5: Use restrictionsprovider framework in Settings.

* commit '6bcd506f224e4a9f0ae15873189d7838c60733ee':
  Use restrictionsprovider framework in Settings.
This commit is contained in:
Julia Reynolds
2014-07-23 22:00:13 +00:00
committed by Android Git Automerger
5 changed files with 120 additions and 149 deletions

View File

@@ -268,6 +268,8 @@
<string name="bluetooth_disconnect_title">Disconnect?</string>
<!-- Bluetooth settings. Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
<string name="bluetooth_disconnect_all_profiles">This will end your connection with:&lt;br>&lt;b><xliff:g id="device_name">%1$s</xliff:g>&lt;/b></string>
<!-- Bluetooth Settings. text displayed when user has restriction DISALLOW_CONFIG_BLUETOOTH [CHAR LIMIT=NONE]-->
<string name="bluetooth_empty_list_user_restricted">You don\'t have permission to change Bluetooth settings.</string>
<!-- Bluetooth Visibility message. This message informs the user that their device is now visible to other bluetooth devices. [CHAR LIMIT=50] -->
<string name="bluetooth_is_visible_message"><xliff:g id="device_name">%1$s</xliff:g> is now visible to nearby devices.</string>
@@ -5792,6 +5794,9 @@
<!-- Full package name of OEM preferred device feedback reporter [DO NOT TRANSLATE] -->
<string name="oem_preferred_feedback_reporter" translatable="false"></string>
<!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
<string name="restr_pin_enter_admin_pin">Enter administrator PIN</string>
<!-- Switch On/Off -->
<string name="switch_on_text">On</string>
<string name="switch_off_text">Off</string>