OSDN Git Service

Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
authorJohn Spurlock <jspurlock@google.com>
Wed, 17 Sep 2014 19:37:27 +0000 (19:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 17 Sep 2014 19:37:27 +0000 (19:37 +0000)
res/values/strings.xml

index df9afb4..e7a124e 100644 (file)
     <!-- 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] -->
+    <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
     <string name="bluetooth_is_visible_message"><xliff:g id="device_name">%1$s</xliff:g> is visible to nearby devices while Bluetooth Settings is open.</string>
     <!-- Bluetooth Visibility discoonect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
     <string name="bluetooth_is_disconnect_question">Disconnect <xliff:g id="device_name">%1$s</xliff:g>?</string>