Merge commit 'fc8d2556' into manualmerge
Conflicts:
res/values/strings.xml
Change-Id: Ia2a4480d13f5afae7ecef321dadf5c4686907d99
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f041f6f..a9d25f5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -330,6 +330,13 @@
<string name="bluetooth_ask_lasting_discovery" product="tablet">An app wants to make your tablet visible to other Bluetooth devices. You can change this later in Bluetooth settings.</string>
<string name="bluetooth_ask_lasting_discovery" product="default">An app wants to make your phone visible to other Bluetooth devices. You can change this later in Bluetooth settings.</string>
+ <!-- Strings for asking to the user whether to allow an app to start broadcasting -->
+ <string name="bluetooth_ask_start_broadcast" product="default"><xliff:g id="app_name">%1$s</xliff:g> wants to turn on Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings.</string>
+ <!-- Strings for asking to the user whether to allow an app to enable bluetooth and start broadcasting -->
+ <string name="bluetooth_ask_enablement_and_start_broadcast" product="default"><xliff:g id="app_name">%1$s</xliff:g> wants to turn on Bluetooth and Bluetooth broadcasting to communicate with other devices nearby. You can change this later in Bluetooth settings.</string>
+ <!-- Strings for bluetooth broadcasting explanation -->
+ <string name="bluetooth_broadcasting_explaination" product="default">When this feature is turned on, your phone can communicate with other devices nearby.\n\nBroadcasting uses low-power Bluetooth signals.</string>
+
<!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
<string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet">An app wants to turn on Bluetooth and make your tablet visible to other devices. You can change this later in Bluetooth settings.</string>
<string name="bluetooth_ask_enablement_and_lasting_discovery" product="default">An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings.</string>