diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-09 18:06:30 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-09 18:06:30 -0400 |
| commit | 6ee7dd09138363737805ae1e6e93649959c6ab83 (patch) | |
| tree | c3b7a3bd6d6dbd84a3f70888a8ea34ac31989954 | |
| parent | 843b4ee178f6cfd7b965c8e2dea5296d1520894d (diff) | |
| parent | 67efa271bbff6f7ab355f8a0f121eca29a4dbec2 (diff) | |
| download | packages_apps_settings-6ee7dd09138363737805ae1e6e93649959c6ab83.zip packages_apps_settings-6ee7dd09138363737805ae1e6e93649959c6ab83.tar.gz packages_apps_settings-6ee7dd09138363737805ae1e6e93649959c6ab83.tar.bz2 | |
Merge change 24435 into eclair
* changes:
Fix display strings and enter passkey handling.
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | src/com/android/settings/bluetooth/BluetoothPairingDialog.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 9043dba..06057e7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -513,9 +513,9 @@ <!-- Title for the bluetooth device info screen. --> <string name="bluetooth_device_info">Bluetooth device info</string> <!-- 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 --> - <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 --> <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 --> diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java index ac5dfba..091ad27 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java @@ -223,7 +223,7 @@ public class BluetoothPairingDialog extends AlertActivity implements DialogInter } mDevice.setPin(pinBytes); } else if (mType == BluetoothDevice.PAIRING_VARIANT_PASSKEY) { - int passkey = Integer.getInteger(value); + int passkey = Integer.parseInt(value); mDevice.setPasskey(passkey); } else { mDevice.setPairingConfirmation(true); |