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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-08 22:21:02 +00:00
committed by Android (Google) Code Review
parent eaceca75b8 a9aeb9c448
commit 01f7e54f19
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() { 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. * Returns android auto string that describes the connection state of this device.
* *
* @param shortSummary {@code true} if need to return short version summary * @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 profileConnected = false; // at least one profile is connected
boolean a2dpNotConnected = false; // A2DP is preferred but not connected boolean a2dpNotConnected = false; // A2DP is preferred but not connected
boolean hfpNotConnected = false; // HFP 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 ? if (getBondState() == BluetoothDevice.BOND_BONDING) {
mContext.getString(R.string.bluetooth_pairing) : return mContext.getString(R.string.bluetooth_pairing);
mContext.getString(R.string.bluetooth_disconnected); }
return useDisconnectedString ? mContext.getString(R.string.bluetooth_disconnected) : null;
} }
/** /**