Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93f696bc authored by jasonwshsu's avatar jasonwshsu
Browse files

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

Root Cause: Did not update device information in device detail page

Solution: Listen to device attributes change and update information in
call function refresh()

Bug: 246877392
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Change-Id: I442445a861898258a73f37ad8f85bcee387fbf58
parent 6e7a8422

src/com/android/settings/bluetooth/BluetoothDetailsPairOtherController.java

+12 −6
Original line number Diff line number Diff line
@@ -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) {

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsPairOtherControllerTest.java

+13 −2
Original line number Diff line number Diff line
@@ -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));

    }

}