Merge "[Audiosharing] Update remote label for clear a11y content" into main (465c4874) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -1900,6 +1900,9 @@

		<string name="volume_dialog_ringer_guidance_ring">Calls and notifications will ring (<xliff:g id="volume level" example="56">%1$s</xliff:g>)</string>

		<!-- Content description for accessibility: audio sharing guest device volume row on volume dialog [CHAR LIMIT=NONE] -->
		<string name="volume_dialog_guest_device_volume_description">Guest device volume</string>

		<!-- An audible a11y label for a button, that opens settings when clicked [CHAR_LIMIT=NONE] -->
		<string name="volume_panel_enter_media_output_settings">Enter output settings</string>
		<!-- An audible a11y state description for a button, that expands volume sliders menu [CHAR_LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -873,7 +873,8 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
		if (ss.level != volume) {
		ss.level = volume;
		}
		String label = mContext.getString(R.string.audio_sharing_description);
		String label =
		mContext.getString(R.string.volume_dialog_guest_device_volume_description);
		if (!Objects.equals(ss.remoteLabel, label)) {
		ss.name = -1;
		ss.remoteLabel = label;

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

+12 −8

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import static android.view.View.INVISIBLE;
		import static android.view.View.LAYOUT_DIRECTION_RTL;
		import static android.view.View.VISIBLE;
		import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;

		import static com.android.internal.jank.InteractionJankMonitor.CUJ_VOLUME_CONTROL;
		import static com.android.internal.jank.InteractionJankMonitor.Configuration.Builder;
		import static com.android.settingslib.flags.Flags.audioSharingDeveloperOption;
		@@ -144,8 +145,11 @@ import com.android.systemui.volume.domain.interactor.VolumeDialogInteractor;
		import com.android.systemui.volume.domain.interactor.VolumePanelNavigationInteractor;
		import com.android.systemui.volume.panel.shared.flag.VolumePanelFlag;
		import com.android.systemui.volume.ui.navigation.VolumeNavigator;

		import com.google.android.msdl.domain.MSDLPlayer;

		import dagger.Lazy;

		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Collections;
		@@ -153,8 +157,6 @@ import java.util.List;
		import java.util.Optional;
		import java.util.function.Consumer;

		import dagger.Lazy;

		/**
		* Visual presentation of the volume dialog.
		*
		@@ -1687,7 +1689,7 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
		// Always show the stream for audio sharing if it exists.
		if ((volumeDialogAudioSharingFix() \|\| audioSharingDeveloperOption())
		&& row.ss != null
		&& mContext.getString(R.string.audio_sharing_description)
		&& mContext.getString(R.string.volume_dialog_guest_device_volume_description)
		.equals(row.ss.remoteLabel)) {
		return true;
		}
		@@ -1896,7 +1898,8 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
		mDynamic.put(stream, true);
		if (findRow(stream) == null) {
		if ((volumeDialogAudioSharingFix() \|\| audioSharingDeveloperOption())
		&& (mContext.getString(R.string.audio_sharing_description)
		&& (mContext.getString(
		R.string.volume_dialog_guest_device_volume_description)
		.equals(ss.remoteLabel))) {
		addRow(
		stream,
		@@ -1981,8 +1984,9 @@ public class VolumeDialogImpl implements VolumeDialog, Dumpable,
		}

		// update header text
		Util.setText(row.header, getStreamLabelH(ss));
		row.slider.setContentDescription(row.header.getText());
		String label = getStreamLabelH(ss);
		Util.setText(row.header, label);
		row.slider.setContentDescription(label);
		mConfigurableTexts.add(row.header, ss.name);

		// update icon

packages/SystemUI/tests/src/com/android/systemui/volume/VolumeDialogImplTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.systemui.volume;

		import java.util.List;
		import static android.media.AudioManager.RINGER_MODE_NORMAL;
		import static android.media.AudioManager.RINGER_MODE_SILENT;
		import static android.media.AudioManager.RINGER_MODE_VIBRATE;
		@@ -110,6 +109,7 @@ import org.mockito.Mockito;
		import org.mockito.MockitoAnnotations;

		import java.util.Arrays;
		import java.util.List;
		import java.util.Optional;
		import java.util.function.Predicate;

		@@ -792,7 +792,7 @@ public class VolumeDialogImplTest extends SysuiTestCase {
		ss.levelMax = 255;
		ss.level = 20;
		ss.name = -1;
		ss.remoteLabel = mContext.getString(R.string.audio_sharing_description);
		ss.remoteLabel = mContext.getString(R.string.volume_dialog_guest_device_volume_description);
		state.states.append(DYNAMIC_STREAM_BROADCAST, ss);

		mDialog.onStateChangedH(state);