Merge "Fix volume panel hang" (62aa8614) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/media/MediaOutputIndicatorSlice.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,9 @@ public class MediaOutputIndicatorSlice implements CustomSliceable {
		@Override
		public Slice getSlice() {
		if (!isVisible()) {
		return null;
		return new ListBuilder(mContext, MEDIA_OUTPUT_INDICATOR_SLICE_URI, ListBuilder.INFINITY)
		.setIsError(true)
		.build();
		}
		final IconCompat icon = IconCompat.createWithResource(mContext,
		com.android.internal.R.drawable.ic_settings_bluetooth);

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

+34 −25

Original line number	Diff line number	Diff line
		@@ -53,9 +53,10 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

		import com.google.android.setupdesign.DividerItemDecoration;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.LinkedHashMap;
		import java.util.List;
		import java.util.Map;

		public class PanelFragment extends Fragment {

		@@ -86,7 +87,7 @@ public class PanelFragment extends Fragment {
		private MetricsFeatureProvider mMetricsProvider;
		private String mPanelClosedKey;

		private final List<LiveData<Slice>> mSliceLiveData = new ArrayList<>();
		private final Map<Uri, LiveData<Slice>> mSliceLiveData = new LinkedHashMap<>();

		@VisibleForTesting
		PanelSlicesLoaderCountdownLatch mPanelSlicesLoaderCountdownLatch;
		@@ -210,10 +211,14 @@ public class PanelFragment extends Fragment {
		mPanelSlicesLoaderCountdownLatch = new PanelSlicesLoaderCountdownLatch(sliceUris.size());

		for (Uri uri : sliceUris) {
		final LiveData<Slice> sliceLiveData = SliceLiveData.fromUri(getActivity(), uri);
		final LiveData<Slice> sliceLiveData = SliceLiveData.fromUri(getActivity(), uri,
		(int type, Throwable source)-> {
		removeSliceLiveData(uri);
		mPanelSlicesLoaderCountdownLatch.markSliceLoaded(uri);
		});

		// Add slice first to make it in order. Will remove it later if there's an error.
		mSliceLiveData.add(sliceLiveData);
		mSliceLiveData.put(uri, sliceLiveData);

		sliceLiveData.observe(getViewLifecycleOwner(), slice -> {
		// If the Slice has already loaded, do nothing.
		@@ -238,12 +243,7 @@ public class PanelFragment extends Fragment {
		*/
		final SliceMetadata metadata = SliceMetadata.from(getActivity(), slice);
		if (slice == null \|\| metadata.isErrorSlice()) {
		final List<String> whiteList = Arrays.asList(
		getResources().getStringArray(
		R.array.config_panel_keep_observe_uri));
		if (!whiteList.contains(uri.toString())) {
		mSliceLiveData.remove(sliceLiveData);
		}
		removeSliceLiveData(uri);
		mPanelSlicesLoaderCountdownLatch.markSliceLoaded(uri);
		} else if (metadata.getLoadingState() == SliceMetadata.LOADED_ALL) {
		mPanelSlicesLoaderCountdownLatch.markSliceLoaded(uri);
		@@ -260,6 +260,15 @@ public class PanelFragment extends Fragment {
		}
		}

		private void removeSliceLiveData(Uri uri) {
		final List<String> whiteList = Arrays.asList(
		getResources().getStringArray(
		R.array.config_panel_keep_observe_uri));
		if (!whiteList.contains(uri.toString())) {
		mSliceLiveData.remove(uri);
		}
		}

		/**
		* When all of the Slices have loaded for the first time, then we can setup the
		* {@link RecyclerView}.

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_INDIC

		import android.app.settings.SettingsEnums;
		import android.content.Context;
		import android.net.Uri;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		@@ -38,6 +39,7 @@ import com.google.android.setupdesign.DividerItemDecoration;

		import java.util.ArrayList;
		import java.util.List;
		import java.util.Map;

		/**
		* RecyclerView adapter for Slices in Settings Panels.
		@@ -56,9 +58,9 @@ public class PanelSlicesAdapter
		private final PanelFragment mPanelFragment;

		public PanelSlicesAdapter(
		PanelFragment fragment, List<LiveData<Slice>> sliceLiveData, int metricsCategory) {
		PanelFragment fragment, Map<Uri, LiveData<Slice>> sliceLiveData, int metricsCategory) {
		mPanelFragment = fragment;
		mSliceLiveData = new ArrayList<>(sliceLiveData);
		mSliceLiveData = new ArrayList<>(sliceLiveData.values());
		mMetricsCategory = metricsCategory;
		}

tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java

+21 −8

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@

		package com.android.settings.media;

		import static android.app.slice.Slice.HINT_ERROR;

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.Mockito.spy;
		@@ -110,11 +112,13 @@ public class MediaOutputIndicatorSliceTest {
		}

		@Test
		public void getSlice_noConnectedDevice_returnNull() {
		public void getSlice_noConnectedDevice_returnErrorSlice() {
		mDevicesList.clear();
		when(mA2dpProfile.getConnectedDevices()).thenReturn(mDevicesList);

		assertThat(mMediaOutputIndicatorSlice.getSlice()).isNull();
		final Slice mediaSlice = mMediaOutputIndicatorSlice.getSlice();
		final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
		assertThat(metadata.isErrorSlice()).isTrue();
		}

		@Test
		@@ -129,6 +133,7 @@ public class MediaOutputIndicatorSliceTest {
		assertThat(metadata.getTitle()).isEqualTo(mContext.getText(R.string.media_output_title));
		assertThat(metadata.getSubtitle()).isEqualTo(mContext.getText(
		R.string.media_output_default_summary));
		assertThat(metadata.isErrorSlice()).isFalse();
		}

		@Test
		@@ -141,6 +146,7 @@ public class MediaOutputIndicatorSliceTest {
		final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
		assertThat(metadata.getTitle()).isEqualTo(mContext.getText(R.string.media_output_title));
		assertThat(metadata.getSubtitle()).isEqualTo(TEST_A2DP_DEVICE_NAME);
		assertThat(metadata.isErrorSlice()).isFalse();
		}

		@Test
		@@ -154,32 +160,39 @@ public class MediaOutputIndicatorSliceTest {
		final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
		assertThat(metadata.getTitle()).isEqualTo(mContext.getText(R.string.media_output_title));
		assertThat(metadata.getSubtitle()).isEqualTo(TEST_HAP_DEVICE_NAME);
		assertThat(metadata.isErrorSlice()).isFalse();
		}

		@Test
		public void getSlice_audioModeIsInCommunication_returnNull() {
		public void getSlice_audioModeIsInCommunication_returnErrorSlice() {
		mDevicesList.add(mA2dpDevice);
		when(mA2dpProfile.getConnectedDevices()).thenReturn(mDevicesList);
		mAudioManager.setMode(AudioManager.MODE_IN_COMMUNICATION);

		assertThat(mMediaOutputIndicatorSlice.getSlice()).isNull();
		final Slice mediaSlice = mMediaOutputIndicatorSlice.getSlice();
		final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
		assertThat(metadata.isErrorSlice()).isTrue();
		}

		@Test
		public void getSlice_audioModeIsRingtone_returnNull() {
		public void getSlice_audioModeIsRingtone_returnErrorSlice() {
		mDevicesList.add(mA2dpDevice);
		when(mA2dpProfile.getConnectedDevices()).thenReturn(mDevicesList);
		mAudioManager.setMode(AudioManager.MODE_RINGTONE);

		assertThat(mMediaOutputIndicatorSlice.getSlice()).isNull();
		final Slice mediaSlice = mMediaOutputIndicatorSlice.getSlice();
		final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
		assertThat(metadata.isErrorSlice()).isTrue();
		}

		@Test
		public void getSlice_audioModeIsInCall_returnNull() {
		public void getSlice_audioModeIsInCall_returnErrorSlice() {
		mDevicesList.add(mA2dpDevice);
		when(mA2dpProfile.getConnectedDevices()).thenReturn(mDevicesList);
		mAudioManager.setMode(AudioManager.MODE_IN_CALL);

		assertThat(mMediaOutputIndicatorSlice.getSlice()).isNull();
		final Slice mediaSlice = mMediaOutputIndicatorSlice.getSlice();
		final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
		assertThat(metadata.isErrorSlice()).isTrue();
		}
		}

tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -49,7 +49,9 @@ import org.robolectric.RuntimeEnvironment;
		import org.robolectric.android.controller.ActivityController;

		import java.util.ArrayList;
		import java.util.LinkedHashMap;
		import java.util.List;
		import java.util.Map;

		@RunWith(RobolectricTestRunner.class)
		public class PanelSlicesAdapterTest {
		@@ -61,7 +63,7 @@ public class PanelSlicesAdapterTest {
		private PanelFeatureProvider mPanelFeatureProvider;
		private FakeFeatureFactory mFakeFeatureFactory;
		private FakePanelContent mFakePanelContent;
		private List<LiveData<Slice>> mData = new ArrayList<>();
		private Map<Uri, LiveData<Slice>> mData = new LinkedHashMap<>();

		@Before
		public void setUp() {
		@@ -93,7 +95,7 @@ public class PanelSlicesAdapterTest {
		doReturn(uri).when(slice).getUri();
		final LiveData<Slice> liveData = mock(LiveData.class);
		when(liveData.getValue()).thenReturn(slice);
		mData.add(liveData);
		mData.put(uri, liveData);
		}

		@Test
		@@ -111,7 +113,7 @@ public class PanelSlicesAdapterTest {
		@Test
		public void sizeOfAdapter_shouldNotExceedMaxNum() {
		for (int i = 0; i < MAX_NUM_OF_SLICES + 2; i++) {
		addTestLiveData(DATA_URI);
		addTestLiveData(Uri.parse("uri" + i));
		}

		assertThat(mData.size()).isEqualTo(MAX_NUM_OF_SLICES + 2);