From 8c6b308c54fca2bc28fc2a6d254055bd911b5c7a Mon Sep 17 00:00:00 2001 From: hughchen Date: Mon, 8 Apr 2019 18:02:50 +0800 Subject: [PATCH] Add "Disconnected" subtitle on disconnected device Bug: 130140873 Test: RunSettingsLibRoboTests Change-Id: Ib54289d0f02ca228c85d4087b9c10753d142bbc1 --- .../com/android/settingslib/media/BluetoothMediaDevice.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java index 2711e31759577..3a53d29f7618d 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/BluetoothMediaDevice.java @@ -22,6 +22,7 @@ import android.graphics.drawable.Drawable; import android.util.Log; import android.util.Pair; +import com.android.settingslib.R; import com.android.settingslib.bluetooth.BluetoothUtils; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -47,7 +48,9 @@ public class BluetoothMediaDevice extends MediaDevice { @Override public String getSummary() { - return mCachedDevice.getConnectionSummary(); + return isConnected() || mCachedDevice.isBusy() + ? mCachedDevice.getConnectionSummary() + : mContext.getString(R.string.bluetooth_disconnected); } @Override