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

Commit 0fbbf7c0 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Display the active volume stream."

parents c5ec8934 4f9750c4
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@

        <LinearLayout
            android:id="@+id/volume_dialog_rows"
            android:layout_width="@dimen/volume_dialog_panel_width"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:clipChildren="false"
            android:clipToPadding="false"
@@ -56,6 +56,7 @@
            android:layout_below="@id/volume_dialog_rows"
            android:background="@drawable/rounded_bg_full"
            android:gravity="center"
            android:layout_gravity="end"
            android:orientation="vertical" >

            <TextView
+3 −4
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ public class VolumeDialogImpl implements VolumeDialog {
    private ViewGroup mDialogView;
    private ViewGroup mDialogRowsView;
    private ImageButton mRingerIcon;
    private ImageButton mOutputChooser;
    private TextView mRingerStatus;
    private final List<VolumeRow> mRows = new ArrayList<>();
    private ConfigurableTexts mConfigurableTexts;
@@ -225,9 +224,6 @@ public class VolumeDialogImpl implements VolumeDialog {
            addExistingRows();
        }

        mOutputChooser = mDialogView.findViewById(R.id.output_chooser);
        mOutputChooser.setOnClickListener(mClickOutputChooser);

        updateRowsH(getActiveRow());
        initRingerH();
    }
@@ -335,6 +331,9 @@ public class VolumeDialogImpl implements VolumeDialog {
        row.slider.setOnSeekBarChangeListener(new VolumeSeekBarChangeListener(row));
        row.anim = null;

        ImageButton outputChooser = row.view.findViewById(R.id.output_chooser);
        outputChooser.setOnClickListener(mClickOutputChooser);

        // forward events above the slider into the slider
        row.view.setOnTouchListener(new OnTouchListener() {
            private final Rect mSliderHitRect = new Rect();