summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntony Sargent <asargent@google.com>2017-09-06 23:15:59 (GMT)
committerIvan Kutepov <its.kutepov@gmail.com>2018-02-08 00:09:28 (GMT)
commit1e78f070ddeff35ce557f9ce6b08de515f54141a (patch)
treec1c48e3a8f12cc59f92af10f5ab147b77323f62e
parent43714a409daccd50e6112f12523bced2e82d191a (diff)
downloadpackages_apps_Settings-1e78f070ddeff35ce557f9ce6b08de515f54141a.zip
packages_apps_Settings-1e78f070ddeff35ce557f9ce6b08de515f54141a.tar.gz
packages_apps_Settings-1e78f070ddeff35ce557f9ce6b08de515f54141a.tar.bz2
Reword bluetooth confirmation dialog
Changing the text near the checkbox allowing contacts/call history access from "Allow $device_name to access your contacts and call history" to just "Allow access to your contacts and call history" to avoid problem where a properly crafted remote device name can make the "to access your contacts and call history" text get pushed down below the fold, and mislead users into thinking the checkbox has a different meaning. Bug: 62672248 Test: manual (initiate bluetooth pairing with another phone or a computer, observe pairing dialog text) Change-Id: I770852739f6791c2b9a36ab45c526bab3f3b9be1 (cherry picked from commit e14d38a3833676a9ee36155371136b83c4bfadb7) CVE-2017-13242
-rw-r--r--res/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6a5d5d8..c4c91c0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1199,7 +1199,7 @@
<string name="bluetooth_display_passkey_pin_msg">To pair with:<xliff:g id="bold1">&lt;br>&lt;b></xliff:g><xliff:g id="device_name">%1$s</xliff:g><xliff:g id="end_bold1">&lt;/b>&lt;br>&lt;br></xliff:g>Type on it:<xliff:g id="bold2">&lt;br>&lt;b></xliff:g><xliff:g id="passkey">%2$s</xliff:g><xliff:g id="end_bold2">&lt;/b></xliff:g>, then press Return or Enter.</string>
<!-- Checkbox message in pairing dialogs. [CHAR LIMIT=NONE] -->
- <string name="bluetooth_pairing_shares_phonebook">Allow <xliff:g id="device_name">%1$s</xliff:g> to access your contacts and call history</string>
+ <string name="bluetooth_pairing_shares_phonebook">Allow access to your contacts and call history</string>
<!-- Title for BT error dialogs. -->
<string name="bluetooth_error_title"></string>