From 493e1a62c8d2528b6a3033e509cff767a061d386 Mon Sep 17 00:00:00 2001 From: Tim Peng Date: Tue, 12 May 2020 17:01:23 +0800 Subject: [PATCH] In Media Switch output panel, Switch access shouldn't select the first device when selecting the device list -The group view should not be clickable -Disable view clickable flag Bug: 151126466 Test: make -j50 RunSettingsRoboTests Change-Id: Ia617f436a615168d422d208959db5513b38e6564 --- src/com/android/settings/panel/PanelSlicesAdapter.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/panel/PanelSlicesAdapter.java b/src/com/android/settings/panel/PanelSlicesAdapter.java index 2f2932c8883..f0a7745acef 100644 --- a/src/com/android/settings/panel/PanelSlicesAdapter.java +++ b/src/com/android/settings/panel/PanelSlicesAdapter.java @@ -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,