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

Change BT pairing UI PIN dialog string for clarity.

Browse Source 
When pairing with a Bluetooth keyboard, the user may not realize
that the PIN should be entered on the keyboard as well as the device.
Added "You may need to enter the same PIN on the Bluetooth device."
to pairing dialog string. Also, remove unused Bluetooth device info
debug strings.

Bug: 3270429
Change-Id: I6d7fa70cf7b12c1feafb8347f356c568b10ae646
This commit is contained in:
Jake Hamby
2010-12-13 15:06:01 -08:00
parent dadf1e53cb
commit 22c4b39e06
2 changed files with 2 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
res/layout/bluetooth_device_info.xml
View File

@@ -1,62 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/scroll_content"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bluetooth_device_info_alias" />
<TextView android:id="@+id/deviceAlias"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bluetooth_device_info_no_alias" />
<Button android:id="@+id/connectButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bluetooth_device_info_connectButton_text" />
<Button android:id="@+id/deleteButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bluetooth_device_info_delete" />
<Button android:id="@+id/querySDP"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bluetooth_device_info_sdp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bluetooth_device_info" />
<TextView android:id="@+id/deviceInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/bluetooth_device_info_deviceInfo_text" />
</LinearLayout>
</ScrollView>

20
res/values/strings.xml
View File

@@ -254,11 +254,6 @@
<!-- Strings for msg to display to user while bluetooth is turning on -->
<string name="bluetooth_turning_on">"Turning on Bluetooth\u2026"</string>
<!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
<string name="bluetooth_device_info_connectButton_text">Turn on Bluetooth</string>
<!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
<string name="bluetooth_device_info_deviceInfo_text" />
<!-- Date & time settings screen title -->
<string name="date_and_time">Date &amp; time settings</string>
<!-- Date/time settings. Summary of the checkbox for choosing between 12 hour time or 24 hour time. Sample of 12-hour time -->
@@ -745,12 +740,10 @@
<!-- Title for the dialog to enter PIN. -->
<string name="bluetooth_pairing_request">Bluetooth pairing request</string>
<!-- 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">\nType PIN to pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022. (Try 0000 or 1234.)</string>
<string name="bluetooth_enter_pin_msg">\nEnter PIN to pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022. (Try 0000 or 1234.) You may need to enter the same PIN on the Bluetooth device.</string>
<!-- Message when bluetooth dialog for passkey entry is showing -->
<string name="bluetooth_enter_passkey_msg">\nType passkey to pair with \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022.</string>
<string name="bluetooth_enter_passkey_msg">\nEnter 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>
<!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
@@ -779,15 +772,6 @@
<!-- Message for the error dialog when BT connecting operation fails generically. -->
<string name="bluetooth_connecting_error_message">There was a problem connecting to <xliff:g id="device_name">%1$s</xliff:g>.</string>
<!-- Do not translate -->
<string name="bluetooth_device_info_alias">Device alias</string>
<!-- Do not translate -->
<string name="bluetooth_device_info_no_alias">Type alias here\u2026</string>
<!-- Do not translate -->
<string name="bluetooth_device_info_delete">Remove this device</string>
<!-- Do not translate -->
<string name="bluetooth_device_info_sdp">List supported services</string>
<!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
<string name="bluetooth_preference_scan_title">Scan for devices</string>
<!-- Bluetooth settings: The title of the preference (list item) that finds nearby devices [CHAR LIMIT=30] -->