PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix display wrong information "pair left/right ear" on device detail page when disconnect one of HA"

Browse Source
This commit is contained in:
Jason Hsu
2022-09-16 09:34:39 +00:00
committed by Android (Google) Code Review
parent d5b3c5ba85 93f696bc99
commit 036833c54d
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/bluetooth/BluetoothDetailsPairOtherController.java
View File

@@ -56,19 +56,25 @@ public class BluetoothDetailsPairOtherController extends BluetoothDetailsControl
@Override
protected void init(PreferenceScreen screen) {
final int side = mCachedDevice.getDeviceSide();
final int stringRes = (side == HearingAidProfile.DeviceSide.SIDE_LEFT)
? R.string.bluetooth_pair_right_ear_button
: R.string.bluetooth_pair_left_ear_button;
mPreference = screen.findPreference(getPreferenceKey());
mPreference.setTitle(stringRes);
updateButtonPreferenceTitle(mPreference);
mPreference.setOnClickListener(v -> launchPairingDetail());
}
@Override
protected void refresh() {
updateButtonPreferenceTitle(mPreference);
mPreference.setVisible(getButtonPreferenceVisibility(mCachedDevice));
}
private void updateButtonPreferenceTitle(ButtonPreference preference) {
final int side = mCachedDevice.getDeviceSide();
final int stringRes = (side == HearingAidProfile.DeviceSide.SIDE_LEFT)
? R.string.bluetooth_pair_right_ear_button
: R.string.bluetooth_pair_left_ear_button;
preference.setTitle(stringRes);
}
private boolean getButtonPreferenceVisibility(CachedBluetoothDevice cachedDevice) {

15
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherControllerTest.java
View File

@@ -56,7 +56,7 @@ public class BluetoothDetailsPairOtherControllerTest extends BluetoothDetailsCon
}
@Test
public void init_leftSideDevice_expectedTitle() {
public void init_leftSideDevice_rightSideButtonTitle() {
when(mCachedDevice.getDeviceSide()).thenReturn(HearingAidProfile.DeviceSide.SIDE_LEFT);
mController.init(mScreen);
@@ -66,7 +66,7 @@ public class BluetoothDetailsPairOtherControllerTest extends BluetoothDetailsCon
}
@Test
public void init_rightSideDevice_expectedTitle() {
public void init_rightSideDevice_leftSideButtonTitle() {
when(mCachedDevice.getDeviceSide()).thenReturn(HearingAidProfile.DeviceSide.SIDE_RIGHT);
mController.init(mScreen);
@@ -118,4 +118,15 @@ public class BluetoothDetailsPairOtherControllerTest extends BluetoothDetailsCon
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void refresh_leftSideDevice_leftSideButtonTitle() {
when(mCachedDevice.getDeviceSide()).thenReturn(HearingAidProfile.DeviceSide.SIDE_RIGHT);
mController.init(mScreen);
mController.refresh();
assertThat(mPreference.getTitle().toString()).isEqualTo(
mContext.getString(R.string.bluetooth_pair_left_ear_button));
}
}