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

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

Merge "Dynamic grouping failed the first time" into rvc-dev

parents 1b5f3478 c433a867

src/com/android/settings/media/MediaOutputGroupSlice.java

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ public class MediaOutputGroupSlice implements CustomSliceable { 
        final IconCompat titleIcon = IconCompat.createWithResource(mContext,

                R.drawable.ic_speaker_group_black_24dp);

        final Bitmap emptyBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);

        if (getWorker() == null) {

            return listBuilder.build();

        }

        final int maxVolume = getWorker().getSessionVolumeMax();

        final String title = mContext.getString(R.string.media_output_group);

        final SliceAction primaryAction = SliceAction.createDeeplink(

tests/robotests/src/com/android/settings/media/MediaOutputGroupSliceTest.java

+6 −0
Original line number Diff line number Diff line
@@ -156,6 +156,12 @@ public class MediaOutputGroupSliceTest { 
        assertThat(rows).isEqualTo(3);

    }



    @Test

    public void getSlice_nullWorker_noException() {

        sMediaDeviceUpdateWorker = null;

        mMediaOutputGroupSlice.getSlice();

    }



    @Test

    public void getSlice_withOneSelectableDevice_checkTitle() {

        mSelectableDevices.add(mDevice1);