diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 49b8c1463c4..9a89ac63318 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -98,7 +98,7 @@ "Párovat s tímto zařízením" "Párování..." - "Párováno" + "Párováno. Odpojeno." "Náhlavní souprava či handsfree" "Vyhledávání" "Požadavek na párování zařízení Bluetooth" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index e17aab0c4e9..e1f2ea48d11 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -98,7 +98,7 @@ "Pairing mit diesem Gerät" "Pairing…" - "Gepaart" + "Gepaart. Nicht verbunden." "Freisprechfunktion/Headset" "Scannen..." "Bluetooth-Pairing-Anfrage" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c2ad91aecdc..b860facd8db 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -98,7 +98,7 @@ "Sincronizar con este dispositivo" "Sincronizando..." - "Sincronizado" + "Sincronizado. Desconectada." "manos libres/auriculares" "Buscando..." "Solicitud de sincronización de Bluetooth" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 826aae8d2bd..d23ac483526 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -98,7 +98,7 @@ "Associer à ce périphérique" "Association…" - "Associé" + "Associé. Déconnecté." "mains libres/casque" "Recherche" "Demande d\'association Bluetooth" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index bab5ed106a7..4b0b22f5073 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -98,7 +98,7 @@ "Accoppia con il dispositivo" "Accoppiamento..." - "Accoppiato" + "Accoppiato. Disconnesso." "vivavoce/auricolare" "Ricerca" "Richiesta accoppiamento Bluetooth" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index a475ee4b74f..bc481c22b38 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -98,7 +98,7 @@ "この端末をペアに設定する" "ペアとして設定中..." - "ペア設定" + "ペア設定。切断。" "ハンズフリー/ヘッドセット" "スキャン中" "Bluetoothペア設定リクエスト" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 7dd2928ab17..99e965773ae 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -98,7 +98,7 @@ "이 장치와 페어링" "페어링 중..." - "페어링됨" + "페어링됨. 연결끊김." "핸즈프리/헤드셋" "검색 중" "Bluetooth 페어링 요청" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 6df044c4ef7..b8da1110f60 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -98,7 +98,7 @@ "Par med denne enheten" "Parer…" - "Paret" + "Paret. Frakoblet." "handsfree/håndsett" "Søker" "Paringsforespørsel for Bluetooth" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index b603e6dab2a..1eb22d3c300 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -98,7 +98,7 @@ "Koppelen met dit apparaat" "Koppelen..." - "Gekoppeld" + "Gekoppeld. Verbinding verbroken." "handsfree/headset" "Scannen" "Bluetooth-koppelingsverzoek" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 6a588f95bca..a70a6768560 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -98,7 +98,7 @@ "Paruj z tym urządzeniem" "Parowanie..." - "Sparowane" + "Sparowane. Rozłączona." "zestaw głośnomówiący/słuchawkowy" "Przeszukiwanie" "Żądanie parowania Bluetooth" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index e12fe163bf2..57f95eea89f 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -98,7 +98,7 @@ "Создать пару с этим устройством" "Идет создание пары..." - "Соединено" + "Соединено. Отключено." "гарнитура/наушники" "Сканирование" "Запрос на соединение Bluetooth" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 1544ceb26e4..51e8bd6e537 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -98,7 +98,7 @@ "与此设备配对" "正在配对..." - "已配对" + "已配对。已断开连接。" "免持听筒/耳机" "正在扫描" "蓝牙配对请求" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index fed0726bc7a..1dda82c7371 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -98,7 +98,7 @@ "與此裝置配對" "配對中..." - "已配對" + "已配對。連線中斷。" "免持/頭戴式" "掃描中" "藍牙配對要求" diff --git a/res/values/strings.xml b/res/values/strings.xml index 6256231c3a9..27329c80550 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -203,7 +203,7 @@ Pairing\u2026 - Paired + Paired but not connected handsfree/headset diff --git a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java index a588013f37d..2ad5726ddc7 100644 --- a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java +++ b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java @@ -92,7 +92,7 @@ public class BluetoothEventRedirector { int oldState = intent.getIntExtra(BluetoothIntent.HEADSET_PREVIOUS_STATE, 0); if (newState == BluetoothHeadset.STATE_DISCONNECTED && oldState == BluetoothHeadset.STATE_CONNECTING) { - mManager.getLocalDeviceManager().onConnectingError(address); + Log.i(TAG, "Failed to connect BT headset"); } } else if (action.equals(BluetoothA2dp.SINK_STATE_CHANGED_ACTION)) { @@ -102,7 +102,7 @@ public class BluetoothEventRedirector { int oldState = intent.getIntExtra(BluetoothA2dp.SINK_PREVIOUS_STATE, 0); if (newState == BluetoothA2dp.STATE_DISCONNECTED && oldState == BluetoothA2dp.STATE_CONNECTING) { - mManager.getLocalDeviceManager().onConnectingError(address); + Log.i(TAG, "Failed to connect BT A2DP"); } } else if (action.equals(BluetoothIntent.REMOTE_DEVICE_CLASS_UPDATED_ACTION)) { diff --git a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java b/src/com/android/settings/bluetooth/LocalBluetoothDevice.java index ac25535ba3e..a4885401e23 100644 --- a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothDevice.java @@ -30,6 +30,7 @@ import android.content.res.Resources; import android.os.IBinder; import android.os.RemoteException; import android.text.TextUtils; +import android.util.Log; import android.view.ContextMenu; import android.view.Menu; import android.view.MenuItem; @@ -190,7 +191,7 @@ public class LocalBluetoothDevice implements Comparable { int status = profileManager.getConnectionStatus(mAddress); if (!SettingsBtStatus.isConnectionStatusConnected(status)) { if (profileManager.connect(mAddress) != BluetoothDevice.RESULT_SUCCESS) { - showConnectingError(); + Log.i(TAG, "Failed to connect " + profile.toString() + " to " + mName); } } }