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

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

Merge "Show media stream with remote streams" into pi-dev

parents 46d03c29 5329ce88

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+4 −10
Original line number Diff line number Diff line
@@ -301,16 +301,9 @@ public class VolumeDialogImpl implements VolumeDialog { 
        if (D.BUG) Slog.d(TAG, "Adding row for stream " + stream);

        VolumeRow row = new VolumeRow();

        initRow(row, stream, iconRes, iconMuteRes, important, defaultStream);

        if (dynamic && mRows.size() > 2) {

            // Dynamic Streams should be the first in the list, so they're shown to start of

            // everything except a11y

            mDialogRowsView.addView(row.view, 1);

            mRows.add(1, row);

        } else {

        mDialogRowsView.addView(row.view);

        mRows.add(row);

    }

    }



    private void addExistingRows() {

        int N = mRows.size();
@@ -603,7 +596,8 @@ public class VolumeDialogImpl implements VolumeDialog { 
            return activeRow.stream == STREAM_RING

                    || activeRow.stream == STREAM_ALARM

                    || activeRow.stream == STREAM_VOICE_CALL

                    || activeRow.stream == STREAM_ACCESSIBILITY;

                    || activeRow.stream == STREAM_ACCESSIBILITY

                    || mDynamic.get(activeRow.stream);

        }



        return false;