diff options
| author | Michael Chan <mchan@android.com> | 2009-08-04 15:02:17 -0700 |
|---|---|---|
| committer | Michael Chan <mchan@android.com> | 2009-08-04 18:20:17 -0700 |
| commit | e41a4ca695db12308006fe1a6d061642b7d3f1a1 (patch) | |
| tree | e4ce18cf055bd2842cb9d22f10a8d4d9ae039bd2 /res/values | |
| parent | 5ee06359237aa789d0bd9a9a1fb57fd1555015a7 (diff) | |
| download | packages_apps_Settings-e41a4ca695db12308006fe1a6d061642b7d3f1a1.zip packages_apps_Settings-e41a4ca695db12308006fe1a6d061642b7d3f1a1.tar.gz packages_apps_Settings-e41a4ca695db12308006fe1a6d061642b7d3f1a1.tar.bz2 | |
Modified the Bluetooth 2.1 Passkey confirmation dialog
- Changed the Passkey confirmation to show Pair/Don't Pair.
- Fixed the problem where the Ok button was showing up as Pair for the error dialog box.
- Disable the toasts when pairing failed in this case. Will need to check if this causes regression in other cases.
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index ad91424..5a72057 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -515,7 +515,11 @@ <!-- Message when bluetooth dialog for passkey entry is showing --> <string name="bluetooth_enter_passkey_msg"><xliff:g id="device_name">%1$s</xliff:g>\n\nType passkey to pair.\n</string> <!-- Message when bluetooth dialog for confirmation of passkey is showing --> - <string name="bluetooth_confirm_passkey_msg">\n Passkey: <xliff:g id="passkey">%2$d</xliff:g>\n\nIs the same passkey displayed on: <xliff:g id="device_name">%1$s</xliff:g> ?\n</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$d</xliff:g>.</string> + <!-- Button text for accepting an incoming pairing request --> + <string name="bluetooth_pairing_accept">Pair</string> + <!-- Button text for declining an incoming pairing request --> + <string name="bluetooth_pairing_decline">Don\u0027t Pair</string> <!-- Title for BT error dialogs. --> <string name="bluetooth_error_title">Attention</string> |