Commit 922121e2 authored by Ryan Hansberry's avatar Ryan Hansberry Committed by Commit Bot

[Bluetooth] Correctly prompt user to enter passkey during keyboard pairing.

The dialog was incorrectly displaying "Connecting to..." when
the keyboard supported and provided "keys entered" events.
We should always continue to prompt the user to enter the passkey
as they enter the passkey.

Bug: 1007375
Change-Id: Ia5cf9d226fe17d902e01aaa24f642a1dab635af6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1875382
Commit-Queue: Ryan Hansberry <hansberry@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709307}
parent 0cee631b
...@@ -23,12 +23,16 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source) { ...@@ -23,12 +23,16 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source) {
// Device connecting and pairing. // Device connecting and pairing.
// These ids are generated in JS using 'bluetooth_' + a value from // These ids are generated in JS using 'bluetooth_' + a value from
// bluetoothPrivate.PairingEventType (see bluetooth_private.idl). // bluetoothPrivate.PairingEventType (see bluetooth_private.idl).
// 'keysEntered', and 'requestAuthorization' have no associated message. // 'requestAuthorization' has no associated message.
{"bluetooth_requestPincode", IDS_SETTINGS_BLUETOOTH_REQUEST_PINCODE}, {"bluetooth_requestPincode", IDS_SETTINGS_BLUETOOTH_REQUEST_PINCODE},
{"bluetooth_displayPincode", IDS_SETTINGS_BLUETOOTH_DISPLAY_PINCODE}, {"bluetooth_displayPincode", IDS_SETTINGS_BLUETOOTH_DISPLAY_PINCODE},
{"bluetooth_requestPasskey", IDS_SETTINGS_BLUETOOTH_REQUEST_PASSKEY}, {"bluetooth_requestPasskey", IDS_SETTINGS_BLUETOOTH_REQUEST_PASSKEY},
{"bluetooth_displayPasskey", IDS_SETTINGS_BLUETOOTH_DISPLAY_PASSKEY}, {"bluetooth_displayPasskey", IDS_SETTINGS_BLUETOOTH_DISPLAY_PASSKEY},
{"bluetooth_confirmPasskey", IDS_SETTINGS_BLUETOOTH_CONFIRM_PASSKEY}, {"bluetooth_confirmPasskey", IDS_SETTINGS_BLUETOOTH_CONFIRM_PASSKEY},
// Also display the IDS_SETTINGS_BLUETOOTH_DISPLAY_PASSKEY for the
// 'keysEntered' event: continue prompting the user to enter the passkey
// as they continue to enter its keys.
{"bluetooth_keysEntered", IDS_SETTINGS_BLUETOOTH_DISPLAY_PASSKEY},
// These ids are generated in JS using 'bluetooth_connect_' + a value from // These ids are generated in JS using 'bluetooth_connect_' + a value from
// bluetoothPrivate.ConnectResultType (see bluetooth_private.idl). // bluetoothPrivate.ConnectResultType (see bluetooth_private.idl).
{"bluetooth_connect_attributeLengthInvalid", {"bluetooth_connect_attributeLengthInvalid",
......
...@@ -478,7 +478,6 @@ Polymer({ ...@@ -478,7 +478,6 @@ Polymer({
getEventDesc_: function(eventType) { getEventDesc_: function(eventType) {
assert(eventType); assert(eventType);
if (eventType == PairingEventType.COMPLETE || if (eventType == PairingEventType.COMPLETE ||
eventType == PairingEventType.KEYS_ENTERED ||
eventType == PairingEventType.REQUEST_AUTHORIZATION) { eventType == PairingEventType.REQUEST_AUTHORIZATION) {
return 'bluetoothStartConnecting'; return 'bluetoothStartConnecting';
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment