auto import from //branches/cupcake/...@132569
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 49b8c14..9a89ac6 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -98,7 +98,7 @@
<skip />
<string name="bluetooth_not_connected">"Párovat s tímto zařízením"</string>
<string name="bluetooth_pairing">"Párování..."</string>
- <string name="bluetooth_paired">"Párováno"</string>
+ <string name="bluetooth_paired">"Párováno. Odpojeno."</string>
<string name="bluetooth_device">"Náhlavní souprava či handsfree"</string>
<string name="progress_scanning">"Vyhledávání"</string>
<string name="bluetooth_notif_ticker">"Požadavek na párování zařízení Bluetooth"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e17aab0..e1f2ea4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -98,7 +98,7 @@
<skip />
<string name="bluetooth_not_connected">"Pairing mit diesem Gerät"</string>
<string name="bluetooth_pairing">"Pairing…"</string>
- <string name="bluetooth_paired">"Gepaart"</string>
+ <string name="bluetooth_paired">"Gepaart. Nicht verbunden."</string>
<string name="bluetooth_device">"Freisprechfunktion/Headset"</string>
<string name="progress_scanning">"Scannen..."</string>
<string name="bluetooth_notif_ticker">"Bluetooth-Pairing-Anfrage"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c2ad91a..b860fac 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -98,7 +98,7 @@
<skip />
<string name="bluetooth_not_connected">"Sincronizar con este dispositivo"</string>
<string name="bluetooth_pairing">"Sincronizando..."</string>
- <string name="bluetooth_paired">"Sincronizado"</string>
+ <string name="bluetooth_paired">"Sincronizado. Desconectada."</string>
<string name="bluetooth_device">"manos libres/auriculares"</string>
<string name="progress_scanning">"Buscando..."</string>
<string name="bluetooth_notif_ticker">"Solicitud de sincronización de Bluetooth"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 826aae8..d23ac48 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -98,7 +98,7 @@
<skip />
<string name="bluetooth_not_connected">"Associer à ce périphérique"</string>
<string name="bluetooth_pairing">"Association…"</string>
- <string name="bluetooth_paired">"Associé"</string>
+ <string name="bluetooth_paired">"Associé. Déconnecté."</string>
<string name="bluetooth_device">"mains libres/casque"</string>
<string name="progress_scanning">"Recherche"</string>
<string name="bluetooth_notif_ticker">"Demande d\'association Bluetooth"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index bab5ed1..4b0b22f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -98,7 +98,7 @@
<skip />
<string name="bluetooth_not_connected">"Accoppia con il dispositivo"</string>
<string name="bluetooth_pairing">"Accoppiamento..."</string>
- <string name="bluetooth_paired">"Accoppiato"</string>
+ <string name="bluetooth_paired">"Accoppiato. Disconnesso."</string>
<string name="bluetooth_device">"vivavoce/auricolare"</string>
<string name="progress_scanning">"Ricerca"</string>
<string name="bluetooth_notif_ticker">"Richiesta accoppiamento Bluetooth"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a475ee4..bc481c2 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -98,7 +98,7 @@
<skip />
<string name="bluetooth_not_connected">"この端末をペアに設定する"</string>
<string name="bluetooth_pairing">"ペアとして設定中..."</string>
- <string name="bluetooth_paired">"ペア設定"</string>
+ <string name="bluetooth_paired">"ペア設定。切断。"</string>
<string name="bluetooth_device">"ハンズフリー/ヘッドセット"</string>
<string name="progress_scanning">"スキャン中"</string>
<string name="bluetooth_notif_ticker">"Bluetoothペア設定リクエスト"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7dd2928..99e9657 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -98,7 +98,7 @@
<skip />
<string name="bluetooth_not_connected">"이 장치와 페어링"</string>
<string name="bluetooth_pairing">"페어링 중..."</string>
- <string name="bluetooth_paired">"페어링됨"</string>
+ <string name="bluetooth_paired">"페어링됨. 연결끊김."</string>
<string name="bluetooth_device">"핸즈프리/헤드셋"</string>
<string name="progress_scanning">"검색 중"</string>
<string name="bluetooth_notif_ticker">"Bluetooth 페어링 요청"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 6df044c..b8da111 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -98,7 +98,7 @@
<skip />
<string name="bluetooth_not_connected">"Par med denne enheten"</string>
<string name="bluetooth_pairing">"Parer…"</string>
- <string name="bluetooth_paired">"Paret"</string>
+ <string name="bluetooth_paired">"Paret. Frakoblet."</string>
<string name="bluetooth_device">"handsfree/håndsett"</string>
<string name="progress_scanning">"Søker"</string>
<string name="bluetooth_notif_ticker">"Paringsforespørsel for Bluetooth"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b603e6d..1eb22d3 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -98,7 +98,7 @@
<skip />
<string name="bluetooth_not_connected">"Koppelen met dit apparaat"</string>
<string name="bluetooth_pairing">"Koppelen..."</string>
- <string name="bluetooth_paired">"Gekoppeld"</string>
+ <string name="bluetooth_paired">"Gekoppeld. Verbinding verbroken."</string>
<string name="bluetooth_device">"handsfree/headset"</string>
<string name="progress_scanning">"Scannen"</string>
<string name="bluetooth_notif_ticker">"Bluetooth-koppelingsverzoek"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6a588f9..a70a676 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -98,7 +98,7 @@
<skip />
<string name="bluetooth_not_connected">"Paruj z tym urządzeniem"</string>
<string name="bluetooth_pairing">"Parowanie..."</string>
- <string name="bluetooth_paired">"Sparowane"</string>
+ <string name="bluetooth_paired">"Sparowane. Rozłączona."</string>
<string name="bluetooth_device">"zestaw głośnomówiący/słuchawkowy"</string>
<string name="progress_scanning">"Przeszukiwanie"</string>
<string name="bluetooth_notif_ticker">"Żądanie parowania Bluetooth"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e12fe16..57f95ee 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -98,7 +98,7 @@
<skip />
<string name="bluetooth_not_connected">"Создать пару с этим устройством"</string>
<string name="bluetooth_pairing">"Идет создание пары..."</string>
- <string name="bluetooth_paired">"Соединено"</string>
+ <string name="bluetooth_paired">"Соединено. Отключено."</string>
<string name="bluetooth_device">"гарнитура/наушники"</string>
<string name="progress_scanning">"Сканирование"</string>
<string name="bluetooth_notif_ticker">"Запрос на соединение Bluetooth"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1544ceb..51e8bd6 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -98,7 +98,7 @@
<skip />
<string name="bluetooth_not_connected">"与此设备配对"</string>
<string name="bluetooth_pairing">"正在配对..."</string>
- <string name="bluetooth_paired">"已配对"</string>
+ <string name="bluetooth_paired">"已配对。已断开连接。"</string>
<string name="bluetooth_device">"免持听筒/耳机"</string>
<string name="progress_scanning">"正在扫描"</string>
<string name="bluetooth_notif_ticker">"蓝牙配对请求"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index fed0726..1dda82c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -98,7 +98,7 @@
<skip />
<string name="bluetooth_not_connected">"與此裝置配對"</string>
<string name="bluetooth_pairing">"配對中..."</string>
- <string name="bluetooth_paired">"已配對"</string>
+ <string name="bluetooth_paired">"已配對。連線中斷。"</string>
<string name="bluetooth_device">"免持/頭戴式"</string>
<string name="progress_scanning">"掃描中"</string>
<string name="bluetooth_notif_ticker">"藍牙配對要求"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6256231..27329c8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -203,7 +203,7 @@
<!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
<string name="bluetooth_pairing">Pairing\u2026</string>
<!--Bluetooth settings screen, summary text under individual Bluetooth devices when paired with one -->
- <string name="bluetooth_paired">Paired</string>
+ <string name="bluetooth_paired">Paired but not connected</string>
<!--Bluetooth settings screen, summary text under individual Bluetooth devices that are hands free or a headset -->
<string name="bluetooth_device">handsfree/headset</string>
<!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
diff --git a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
index a588013..2ad5726 100644
--- a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
+++ b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
@@ -92,7 +92,7 @@
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 @@
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 ac25535..a488540 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothDevice.java
@@ -30,6 +30,7 @@
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 @@
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);
}
}
}