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

Commit bd75d389 authored by tim peng's avatar tim peng Committed by Automerger Merge Worker
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 am: 76438777

Change-Id: I9ab4c04b75fdb9d5bd3f1b5f2ff56c00f744e8fd
parents 56ed13a1 76438777

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,