Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Specify whether or not the disconnected string should be used" into tm-dev am: 01f7e54f19

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17388861

Change-Id: I193d53fa013a65fb458d9fa6e8e5b671366680c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-08 22:37:33 +00:00
committed by Automerger Merge Worker
parent dc9dc8f9a9 01f7e54f19
commit f1b9ae0941
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
View File

@@ -1157,18 +1157,26 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
}
/**
* See {@link #getCarConnectionSummary(boolean)}
* See {@link #getCarConnectionSummary(boolean, boolean)}
*/
public String getCarConnectionSummary() {
return getCarConnectionSummary(false);
return getCarConnectionSummary(false /* shortSummary */);
}
/**
* See {@link #getCarConnectionSummary(boolean, boolean)}
*/
public String getCarConnectionSummary(boolean shortSummary) {
return getCarConnectionSummary(shortSummary, true /* useDisconnectedString */);
}
/**
* Returns android auto string that describes the connection state of this device.
*
* @param shortSummary {@code true} if need to return short version summary
* @param useDisconnectedString {@code true} if need to return disconnected summary string
*/
public String getCarConnectionSummary(boolean shortSummary) {
public String getCarConnectionSummary(boolean shortSummary, boolean useDisconnectedString) {
boolean profileConnected = false; // at least one profile is connected
boolean a2dpNotConnected = false; // A2DP is preferred but not connected
boolean hfpNotConnected = false; // HFP is preferred but not connected
@@ -1286,9 +1294,10 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
}
}
return getBondState() == BluetoothDevice.BOND_BONDING ?
mContext.getString(R.string.bluetooth_pairing) :
mContext.getString(R.string.bluetooth_disconnected);
if (getBondState() == BluetoothDevice.BOND_BONDING) {
return mContext.getString(R.string.bluetooth_pairing);
}
return useDisconnectedString ? mContext.getString(R.string.bluetooth_disconnected) : null;
}
/**