Merge "Update BT summary for tws device" (cc843f3e) · Commits · e / os / android_frameworks_base

packages/SettingsLib/res/values/strings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -185,8 +185,12 @@

		<!-- Connected devices settings. Message when Bluetooth is connected and active, showing remote device status and battery level. [CHAR LIMIT=NONE] -->
		<string name="bluetooth_active_battery_level">Active, <xliff:g id="battery_level_as_percentage">%1$s</xliff:g> battery</string>
		<!-- Connected devices settings. Message when Bluetooth is connected and active, showing remote device status and battery level for untethered headset. [CHAR LIMIT=NONE] -->
		<string name="bluetooth_active_battery_level_untethered">Active, L: <xliff:g id="battery_level_as_percentage" example="25%">%1$s</xliff:g> battery, R: <xliff:g id="battery_level_as_percentage" example="25%">%2$s</xliff:g> battery</string>
		<!-- Connected devices settings. Message when Bluetooth is connected but not in use, showing remote device battery level. [CHAR LIMIT=NONE] -->
		<string name="bluetooth_battery_level"><xliff:g id="battery_level_as_percentage">%1$s</xliff:g> battery</string>
		<!-- Connected devices settings. Message when Bluetooth is connected but not in use, showing remote device battery level for untethered headset. [CHAR LIMIT=NONE] -->
		<string name="bluetooth_battery_level_untethered">L: <xliff:g id="battery_level_as_percentage" example="25%">%1$s</xliff:g> battery, R: <xliff:g id="battery_level_as_percentage" example="25%">%2$s</xliff:g> battery</string>
		<!-- Connected devices settings. Message when Bluetooth is connected and active but no battery information, showing remote device status. [CHAR LIMIT=NONE] -->
		<string name="bluetooth_active_no_battery_level">Active</string>

packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java

+42 −10

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.util.Log;
		import androidx.annotation.VisibleForTesting;

		import com.android.settingslib.R;
		import com.android.settingslib.Utils;

		import java.util.ArrayList;
		import java.util.Collection;
		@@ -830,6 +831,8 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
		boolean a2dpConnected = true; // A2DP is connected
		boolean hfpConnected = true; // HFP is connected
		boolean hearingAidConnected = true; // Hearing Aid is connected
		int leftBattery = -1;
		int rightBattery = -1;

		synchronized (mProfileLock) {
		for (LocalBluetoothProfile profile : getProfiles()) {
		@@ -877,8 +880,23 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
		int stringRes = R.string.bluetooth_pairing;
		//when profile is connected, information would be available
		if (profileConnected) {
		// Update Meta data for connected device
		if (Boolean.parseBoolean(
		mDevice.getMetadata(BluetoothDevice.METADATA_IS_UNTHETHERED_HEADSET))) {
		try {
		leftBattery = Integer.parseInt(
		mDevice.getMetadata(BluetoothDevice.METADATA_UNTHETHERED_LEFT_BATTERY));
		rightBattery = Integer.parseInt(mDevice.getMetadata(
		BluetoothDevice.METADATA_UNTHETHERED_RIGHT_BATTERY));
		} catch (NumberFormatException e) {
		Log.d(TAG, "Parse error for unthethered battery level.");
		}
		}

		// Set default string with battery level in device connected situation.
		if (batteryLevelPercentageString != null) {
		if (isTwsBatteryAvailable(leftBattery, rightBattery)) {
		stringRes = R.string.bluetooth_battery_level_untethered;
		} else if (batteryLevelPercentageString != null) {
		stringRes = R.string.bluetooth_battery_level;
		}

		@@ -887,22 +905,36 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
		// 2. Headset device active with in-calling state.
		// 3. A2DP device active without in-calling state.
		if (a2dpConnected \|\| hfpConnected \|\| hearingAidConnected) {
		final boolean isOnCall =
		com.android.settingslib.Utils.isAudioModeOngoingCall(mContext);
		final boolean isOnCall = Utils.isAudioModeOngoingCall(mContext);
		if ((mIsActiveDeviceHearingAid)
		\|\| (mIsActiveDeviceHeadset && isOnCall)
		\|\| (mIsActiveDeviceA2dp && !isOnCall)) {
		stringRes = (batteryLevelPercentageString != null)
		? R.string.bluetooth_active_battery_level
		: R.string.bluetooth_active_no_battery_level;
		if (isTwsBatteryAvailable(leftBattery, rightBattery)) {
		stringRes = R.string.bluetooth_active_battery_level_untethered;
		} else if (batteryLevelPercentageString != null) {
		stringRes = R.string.bluetooth_active_battery_level;
		} else {
		stringRes = R.string.bluetooth_active_no_battery_level;
		}
		}
		}
		}

		return (stringRes != R.string.bluetooth_pairing
		\|\| getBondState() == BluetoothDevice.BOND_BONDING)
		? mContext.getString(stringRes, batteryLevelPercentageString)
		: null;
		if (stringRes != R.string.bluetooth_pairing
		\|\| getBondState() == BluetoothDevice.BOND_BONDING) {
		if (isTwsBatteryAvailable(leftBattery, rightBattery)) {
		return mContext.getString(stringRes, Utils.formatPercentage(leftBattery),
		Utils.formatPercentage(rightBattery));
		} else {
		return mContext.getString(stringRes, batteryLevelPercentageString);
		}
		} else {
		return null;
		}
		}

		private boolean isTwsBatteryAvailable(int leftBattery, int rightBattery) {
		return leftBattery >= 0 && rightBattery >= 0;
		}

		/**

packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceTest.java

+45 −8

Original line number	Diff line number	Diff line
		@@ -41,14 +41,16 @@ import org.robolectric.RuntimeEnvironment;

		@RunWith(RobolectricTestRunner.class)
		public class CachedBluetoothDeviceTest {
		private final static String DEVICE_NAME = "TestName";
		private final static String DEVICE_ALIAS = "TestAlias";
		private final static String DEVICE_ADDRESS = "AA:BB:CC:DD:EE:FF";
		private final static String DEVICE_ALIAS_NEW = "TestAliasNew";
		private final static short RSSI_1 = 10;
		private final static short RSSI_2 = 11;
		private final static boolean JUSTDISCOVERED_1 = true;
		private final static boolean JUSTDISCOVERED_2 = false;
		private static final String DEVICE_NAME = "TestName";
		private static final String DEVICE_ALIAS = "TestAlias";
		private static final String DEVICE_ADDRESS = "AA:BB:CC:DD:EE:FF";
		private static final String DEVICE_ALIAS_NEW = "TestAliasNew";
		private static final String TWS_BATTERY_LEFT = "15";
		private static final String TWS_BATTERY_RIGHT = "25";
		private static final short RSSI_1 = 10;
		private static final short RSSI_2 = 11;
		private static final boolean JUSTDISCOVERED_1 = true;
		private static final boolean JUSTDISCOVERED_2 = false;
		@Mock
		private LocalBluetoothProfileManager mProfileManager;
		@Mock
		@@ -446,6 +448,41 @@ public class CachedBluetoothDeviceTest {
		assertThat(mCachedDevice.getConnectionSummary()).isEqualTo("Pairing…");
		}

		@Test
		public void getConnectionSummary_trueWirelessActiveDeviceWithBattery_returnActiveWithBattery() {
		updateProfileStatus(mA2dpProfile, BluetoothProfile.STATE_CONNECTED);
		updateProfileStatus(mHfpProfile, BluetoothProfile.STATE_CONNECTED);
		updateProfileStatus(mHearingAidProfile, BluetoothProfile.STATE_CONNECTED);
		when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
		mCachedDevice.onActiveDeviceChanged(true, BluetoothProfile.HEARING_AID);
		when(mDevice.getMetadata(BluetoothDevice.METADATA_IS_UNTHETHERED_HEADSET)).thenReturn(
		"true");
		when(mDevice.getMetadata(BluetoothDevice.METADATA_UNTHETHERED_LEFT_BATTERY)).thenReturn(
		TWS_BATTERY_LEFT);
		when(mDevice.getMetadata(BluetoothDevice.METADATA_UNTHETHERED_RIGHT_BATTERY)).thenReturn(
		TWS_BATTERY_RIGHT);

		assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(
		"Active, L: 15% battery, R: 25% battery");
		}

		@Test
		public void getConnectionSummary_trueWirelessDeviceWithBattery_returnActiveWithBattery() {
		updateProfileStatus(mA2dpProfile, BluetoothProfile.STATE_CONNECTED);
		updateProfileStatus(mHfpProfile, BluetoothProfile.STATE_CONNECTED);
		updateProfileStatus(mHearingAidProfile, BluetoothProfile.STATE_CONNECTED);
		when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
		when(mDevice.getMetadata(BluetoothDevice.METADATA_IS_UNTHETHERED_HEADSET)).thenReturn(
		"true");
		when(mDevice.getMetadata(BluetoothDevice.METADATA_UNTHETHERED_LEFT_BATTERY)).thenReturn(
		TWS_BATTERY_LEFT);
		when(mDevice.getMetadata(BluetoothDevice.METADATA_UNTHETHERED_RIGHT_BATTERY)).thenReturn(
		TWS_BATTERY_RIGHT);

		assertThat(mCachedDevice.getConnectionSummary()).isEqualTo(
		"L: 15% battery, R: 25% battery");
		}

		@Test
		public void getCarConnectionSummary_singleProfileConnectDisconnect() {
		// Test without battery level