PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix display strings and enter passkey handling.

Browse Source
This commit is contained in:
Jaikumar Ganesh
2009-09-09 14:57:19 -07:00
parent 140fb90a5c
commit 67efa271bb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -513,9 +513,9 @@
<!-- Title for the bluetooth device info screen. --> <!-- Title for the bluetooth device info screen. -->
<string name="bluetooth_device_info">Bluetooth device info</string> <string name="bluetooth_device_info">Bluetooth device info</string>
<!-- Message when bluetooth dialog for pin entry is showing --> <!-- Message when bluetooth dialog for pin entry is showing -->
<string name="bluetooth_enter_pin_msg"><xliff:g id="device_name">%1$s</xliff:g>\nType PIN to pair.\n(Try 0000 or 1234.)</string> <string name="bluetooth_enter_pin_msg">\nType PIN to pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022. (Try 0000 or 1234.)</string>
<!-- Message when bluetooth dialog for passkey entry is showing --> <!-- Message when bluetooth dialog for passkey entry is showing -->
<string name="bluetooth_enter_passkey_msg"><xliff:g id="device_name">%1$s</xliff:g>\nType passkey to pair.\n</string> <string name="bluetooth_enter_passkey_msg">\nType passkey to pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022.</string>
<!-- Message when bluetooth dialog for confirmation of passkey is showing --> <!-- Message when bluetooth dialog for confirmation of passkey is showing -->
<string name="bluetooth_confirm_passkey_msg">To pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022, confirm that it is showing the passkey: <xliff:g id="passkey">%2$s</xliff:g>.</string> <string name="bluetooth_confirm_passkey_msg">To pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022, confirm that it is showing the passkey: <xliff:g id="passkey">%2$s</xliff:g>.</string>
<!-- Button text for accepting an incoming pairing request --> <!-- Button text for accepting an incoming pairing request -->

2
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
View File

@@ -223,7 +223,7 @@ public class BluetoothPairingDialog extends AlertActivity implements DialogInter
} }
mDevice.setPin(pinBytes); mDevice.setPin(pinBytes);
} else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY) { } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY) {
int passkey = Integer.getInteger(value); int passkey = Integer.parseInt(value);
mDevice.setPasskey(passkey); mDevice.setPasskey(passkey);
} else { } else {
mDevice.setPairingConfirmation(true); mDevice.setPairingConfirmation(true);