chrome/android/java/strings/android_chrome_strings.grd - Issue 2102813002: If location services are turned off, have the BT chooser prompt the user to turn them on.

Unified Diff: chrome/android/java/strings/android_chrome_strings.grd

Issue 2102813002: If location services are turned off, have the BT chooser prompt the user to turn them on. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-fix-testing

Patch Set: Fix merge conflicts Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/android/java/src/org/chromium/chrome/browser/BluetoothChooserDialog.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/ItemChooserDialog.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/BluetoothChooserDialogTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/strings/android_chrome_strings.grd

diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd

index 4913952ceadaaf90d9521965f5a00f558a0fd16b..62d99da0541c0e30559d4effe161dfce59572a8b 100644

--- a/chrome/android/java/strings/android_chrome_strings.grd

+++ b/chrome/android/java/strings/android_chrome_strings.grd

@@ -1225,7 +1225,13 @@ To obtain new licenses, connect to the internet and play your downloaded content

</message>

- Chrome needs location access to scan for devices. <ph name="BEGIN_LINK"><link></ph>Update permissions<ph name="END_LINK"></link></ph>

+ Chrome needs location access to scan for devices. <ph name="BEGIN_LINK"><permission_link></ph>Update permissions<ph name="END_LINK"></permission_link></ph>

+ </message>

+ <message name="IDS_BLUETOOTH_NEED_LOCATION_SERVICES_ON" desc="The message to show when scanning cannot start because Android location services are off, but they must be turned on for Android to return any Bluetooth devices from a scan.">

+ Chrome needs location access to scan for devices. Location access is <ph name="BEGIN_LINK"><services_link></ph>turned off for this device<ph name="END_LINK"></services_link></ph>.

+ </message>

+ <message name="IDS_BLUETOOTH_NEED_LOCATION_PERMISSION_AND_SERVICES_ON" desc="The message to show when scanning cannot start because Chrome doesn't have the Location permission and the device's location services are turned off, and both must be enabled in order for Android to return any Bluetooth devices from a scan.">

+ Chrome needs location access to scan for devices. <ph name="BEGIN_LINK1"><permission_link></ph>Update permissions<ph name="END_LINK1"></permission_link></ph>. Location access is also <ph name="BEGIN_LINK2"><services_link></ph>turned off for this device<ph name="END_LINK2"></services_link></ph>.

</message>