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

Commit 77d218ab authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update UI when BT device is rename" into pi-dev

parents a866d6bd 615becb3

src/com/android/settings/sound/AudioSwitchPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont 
            final BluetoothDevice btDevice = mConnectedDevices.get(connectedDeviceIndex);

            mSelectedIndex = connectedDeviceIndex;

            setActiveBluetoothDevice(btDevice);

            listPreference.setSummary(btDevice.getName());

            listPreference.setSummary(btDevice.getAliasName());

        }

        return true;

    }
@@ -328,7 +328,7 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont 
        mediaValues[mSelectedIndex] = mContext.getText(R.string.media_output_default_summary);

        for (int i = 0, size = mConnectedDevices.size(); i < size; i++) {

            final BluetoothDevice btDevice = mConnectedDevices.get(i);

            mediaOutputs[i] = btDevice.getName();

            mediaOutputs[i] = btDevice.getAliasName();

            mediaValues[i] = btDevice.getAddress();

            if (btDevice.equals(activeDevice)) {

                // select the active connected device.

src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java

+5 −1
Original line number Diff line number Diff line
@@ -66,7 +66,11 @@ public class HandsFreeProfileOutputPreferenceController extends 
        if (numDevices == 0) {

            // No connected devices, disable switch entry.

            mPreference.setVisible(false);

            preference.setSummary(mContext.getText(R.string.media_output_default_summary));

            final CharSequence summary = mContext.getText(R.string.media_output_default_summary);

            final CharSequence[] defaultMediaOutput = new CharSequence[]{summary};

            mSelectedIndex = getDefaultDeviceIndex();

            preference.setSummary(summary);

            setPreference(defaultMediaOutput, defaultMediaOutput, preference);

            return;

        }

src/com/android/settings/sound/MediaOutputPreferenceController.java

+5 −1
Original line number Diff line number Diff line
@@ -78,7 +78,11 @@ public class MediaOutputPreferenceController extends AudioSwitchPreferenceContro 
        if (numDevices == 0) {

            // Disable switch entry if there is no connected devices.

            mPreference.setVisible(false);

            preference.setSummary(mContext.getText(R.string.media_output_default_summary));

            final CharSequence summary = mContext.getText(R.string.media_output_default_summary);

            final CharSequence[] defaultMediaOutput = new CharSequence[]{summary};

            mSelectedIndex = getDefaultDeviceIndex();

            preference.setSummary(summary);

            setPreference(defaultMediaOutput, defaultMediaOutput, preference);

            return;

        }

tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ public class AudioOutputSwitchPreferenceControllerTest { 


        mController.onPreferenceChange(mPreference, TEST_DEVICE_ADDRESS_1);



        assertThat(mPreference.getSummary()).isEqualTo(mBluetoothDevice.getName());

        assertThat(mPreference.getSummary()).isEqualTo(TEST_DEVICE_NAME_1);

    }



    /**
@@ -246,7 +246,7 @@ public class AudioOutputSwitchPreferenceControllerTest { 


        mController.onPreferenceChange(mPreference, TEST_DEVICE_ADDRESS_2);



        assertThat(mPreference.getSummary()).isEqualTo(secondBluetoothDevice.getName());

        assertThat(mPreference.getSummary()).isEqualTo(TEST_DEVICE_NAME_2);

    }



    /**

tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest { 
        mController.updateState(mPreference);



        assertThat(mPreference.isVisible()).isTrue();

        assertThat(mPreference.getSummary()).isEqualTo(mBluetoothDevice.getName());

        assertThat(mPreference.getSummary()).isEqualTo(TEST_DEVICE_NAME_1);

    }



    /**
@@ -275,7 +275,7 @@ public class HandsFreeProfileOutputPreferenceControllerTest { 
        mController.updateState(mPreference);



        assertThat(mPreference.isVisible()).isTrue();

        assertThat(mPreference.getSummary()).isEqualTo(mSecondBluetoothDevice.getName());

        assertThat(mPreference.getSummary()).isEqualTo(TEST_DEVICE_NAME_2);

    }



    /**