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

Commit 76438777 authored by tim peng's avatar tim peng Committed by Android (Google) Code Review
Browse files

Merge "In Media Switch output panel, Switch access shouldn't select the first... 

Merge "In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list" into rvc-dev
parents 72638462 493e1a62

src/com/android/settings/panel/PanelSlicesAdapter.java

+3 −4
Original line number Diff line number Diff line
@@ -140,11 +140,10 @@ public class PanelSlicesAdapter 
            final Slice slice = sliceLiveData.getValue();

            if (slice == null || slice.getUri().equals(MEDIA_OUTPUT_INDICATOR_SLICE_URI)) {

                mDividerAllowedAbove = false;

            }



            // Customize output switcher slice top padding

            if (position == 0 && (slice.getUri().equals(MEDIA_OUTPUT_SLICE_URI)

            } else if (position == 0 && (slice.getUri().equals(MEDIA_OUTPUT_SLICE_URI)

                    || slice.getUri().equals(MEDIA_OUTPUT_GROUP_SLICE_URI))) {

                sliceView.setClickable(false);

                // Customize output switcher slice top padding

                final int paddingTop = mPanelFragment.getResources().getDimensionPixelSize(

                        R.dimen.output_switcher_slice_padding_top);

                mSliceSliderLayout.setPadding(mSliceSliderLayout.getPaddingLeft(), paddingTop,