diff options
| author | Martijn Coenen <maco@google.com> | 2012-04-24 09:03:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-24 09:03:44 -0700 |
| commit | 290850af68a479143c15b28dd9824b2a33a555d4 (patch) | |
| tree | dafcd4c87878bc7f7953a44e0cf8d052eae80b9e /res | |
| parent | 8ab91de2a6be340156f4792f5ffd28e4ad5a05a2 (diff) | |
| parent | 8099f5e7bfa7227ba674b5f0076f331e737bafd7 (diff) | |
| download | android_packages_apps_Bluetooth-290850af68a479143c15b28dd9824b2a33a555d4.tar.gz android_packages_apps_Bluetooth-290850af68a479143c15b28dd9824b2a33a555d4.tar.bz2 android_packages_apps_Bluetooth-290850af68a479143c15b28dd9824b2a33a555d4.zip | |
Merge "Additional changes to support Bluetooth Beam."
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 03d8324f2..f58543b4c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -32,6 +32,17 @@ <string name="permdesc_bluetoothShareManager">Allows the app to access the BluetoothShare manager and use it to transfer files. </string> + <string name="permlab_bluetoothWhitelist">Whitelist bluetooth device access.</string> + + <string name="permdesc_bluetoothWhitelist">Allows the app to temporarily whitelist + a Bluetooth device, allowing that device to send files to this device without user + confirmation.</string> + + <!-- Strings used for a (system only) permission --> + <string name="permlab_handoverStatus">Receive BT handover transfer broadcasts.</string> + <string name="permdesc_handoverStatus">Allows receiving handover transfer status + information from Bluetooth.</string> + <!-- string showed on "Share picutre via" dialog --> <string name="bt_share_picker_label">Bluetooth</string> |