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

Commit c2f211b4 authored by Yiyi Shen's avatar Yiyi Shen
Browse files

[Audiosharing] Format files 

Flag: com.android.settingslib.flags.enable_le_audio_sharing
Test: atest
Bug: 305620450
Change-Id: I6fca651de9e34023fcd2ce57e79dccdecb47fefe
parent 3bed59a9

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeControlUpdater.java

+2 −3
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ public class AudioSharingDeviceVolumeControlUpdater extends BluetoothDeviceUpdat 


    private static final String TAG = "AudioSharingVolUpdater";



    @VisibleForTesting

    static final String PREF_KEY_PREFIX = "audio_sharing_volume_control_";

    @VisibleForTesting static final String PREF_KEY_PREFIX = "audio_sharing_volume_control_";



    @Nullable private final LocalBluetoothManager mBtManager;

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumePreference.java

+5 −4
Original line number Diff line number Diff line
@@ -110,8 +110,7 @@ public class AudioSharingDeviceVolumePreference extends SeekBarPreference { 
        if ((o == null) || !(o instanceof AudioSharingDeviceVolumePreference)) {

            return false;

        }

        return mCachedDevice.equals(

                ((AudioSharingDeviceVolumePreference) o).mCachedDevice);

        return mCachedDevice.equals(((AudioSharingDeviceVolumePreference) o).mCachedDevice);

    }



    @Override
@@ -170,7 +169,9 @@ public class AudioSharingDeviceVolumePreference extends SeekBarPreference { 
            Log.d(TAG, "Skip set device volume, device is null");

            return;

        }

        VolumeControlProfile vc = mBtManager == null ? null

        VolumeControlProfile vc =

                mBtManager == null

                        ? null

                        : mBtManager.getProfileManager().getVolumeControlProfile();

        if (vc != null) {

            vc.setDeviceVolume(device, progress, /* isGroupOp= */ true);

src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumeSliderPreference.java

+6 −6
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ public class AudioSharingDeviceVolumeSliderPreference extends SliderPreference { 
                (pref, value) -> {

                    handleProgressChange((int) value);

                    return true;

                }

        );

                });

        refreshPreference();

    }
@@ -85,8 +84,7 @@ public class AudioSharingDeviceVolumeSliderPreference extends SliderPreference { 
        if ((o == null) || !(o instanceof AudioSharingDeviceVolumeSliderPreference)) {

            return false;

        }

        return mCachedDevice.equals(

                ((AudioSharingDeviceVolumeSliderPreference) o).mCachedDevice);

        return mCachedDevice.equals(((AudioSharingDeviceVolumeSliderPreference) o).mCachedDevice);

    }



    @Override
@@ -145,7 +143,9 @@ public class AudioSharingDeviceVolumeSliderPreference extends SliderPreference { 
            Log.d(TAG, "Skip set device volume, device is null");

            return;

        }

        VolumeControlProfile vc = mBtManager == null ? null

        VolumeControlProfile vc =

                mBtManager == null

                        ? null

                        : mBtManager.getProfileManager().getVolumeControlProfile();

        if (vc != null) {

            vc.setDeviceVolume(device, progress, /* isGroupOp= */ true);

src/com/android/settings/connecteddevice/audiosharing/AudioSharingUtils.java

+5 −6
Original line number Diff line number Diff line
@@ -424,8 +424,7 @@ public class AudioSharingUtils { 
     */

    @NonNull

    public static Pair<Integer, Object>[] buildAddSourceEventData(

            int sourcePageId,

            boolean userTriggered) {

            int sourcePageId, boolean userTriggered) {

        return new Pair[] {

            Pair.create(METRIC_KEY_SOURCE_PAGE_ID.getId(), sourcePageId),

            Pair.create(METRIC_KEY_USER_TRIGGERED.getId(), userTriggered ? 1 : 0)

tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDeviceVolumePreferenceTest.java

+13 −9
Original line number Diff line number Diff line
@@ -131,8 +131,10 @@ public class AudioSharingDeviceVolumePreferenceTest { 
        assertThat(mPreference.getMax()).isEqualTo(AudioSharingDeviceVolumePreference.MAX_VOLUME);

        assertThat(mPreference.getMin()).isEqualTo(AudioSharingDeviceVolumePreference.MIN_VOLUME);

        assertThat(mPreference.getTitle().toString()).isEqualTo(TEST_DEVICE_NAME);

        verify(mPreference).setSeekBarContentDescription(

                mContext.getString(R.string.audio_sharing_device_volume_description,

        verify(mPreference)

                .setSeekBarContentDescription(

                        mContext.getString(

                                R.string.audio_sharing_device_volume_description,

                                TEST_DEVICE_NAME));

    }
@@ -329,16 +331,16 @@ public class AudioSharingDeviceVolumePreferenceTest { 


    @Test

    public void equals_returnsTrue() {

        AudioSharingDeviceVolumePreference preference = new AudioSharingDeviceVolumePreference(

                mContext, mCachedDevice);

        AudioSharingDeviceVolumePreference preference =

                new AudioSharingDeviceVolumePreference(mContext, mCachedDevice);

        assertThat(mPreference.equals(preference)).isTrue();

    }



    @Test

    public void equals_returnsFalse() {

        CachedBluetoothDevice cachedDevice = mock(CachedBluetoothDevice.class);

        AudioSharingDeviceVolumePreference preference = new AudioSharingDeviceVolumePreference(

                mContext, cachedDevice);

        AudioSharingDeviceVolumePreference preference =

                new AudioSharingDeviceVolumePreference(mContext, cachedDevice);

        assertThat(mPreference.equals(preference)).isFalse();

    }
@@ -361,7 +363,9 @@ public class AudioSharingDeviceVolumePreferenceTest { 
        shadowOf(Looper.getMainLooper()).idle();



        assertThat(mPreference.getTitle().toString()).isEqualTo("new");

        verify(mPreference).setSeekBarContentDescription(

                mContext.getString(R.string.audio_sharing_device_volume_description, "new"));

        verify(mPreference)

                .setSeekBarContentDescription(

                        mContext.getString(

                                R.string.audio_sharing_device_volume_description, "new"));

    }

}