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

Commit dfe0b4df authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Improve content descriptions for volume dialog icons.

Bug: 27971063
Change-Id: I9282083f68a5cd607fe0cb2893829675559acb6d
parent e46bb37a
Loading
Loading
Loading
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -1082,6 +1082,10 @@
    <string name="volume_stream_limited_dnd" translatable="false">%s — Priority only</string>
    <string name="volume_stream_limited_dnd" translatable="false">%s — Priority only</string>
    <string name="volume_stream_vibrate_dnd" translatable="false">%s vibrate — Priority only</string>
    <string name="volume_stream_vibrate_dnd" translatable="false">%s vibrate — Priority only</string>


    <string name="volume_stream_content_description_unmute">%1$s. Tap to unmute.</string>
    <string name="volume_stream_content_description_vibrate">%1$s. Tap to set to vibrate. Accessibility services may be muted.</string>
    <string name="volume_stream_content_description_mute">%1$s. Tap to mute. Accessibility services may be muted.</string>

    <!-- Name of special SystemUI debug settings -->
    <!-- Name of special SystemUI debug settings -->
    <string name="system_ui_tuner">System UI Tuner</string>
    <string name="system_ui_tuner">System UI Tuner</string>


+31 −1
Original line number Original line Diff line number Diff line
@@ -761,7 +761,37 @@ public class VolumeDialog implements TunerService.Tunable {
                : (iconRes == R.drawable.ic_volume_media_bt || iconRes == row.iconRes)
                : (iconRes == R.drawable.ic_volume_media_bt || iconRes == row.iconRes)
                        ? Events.ICON_STATE_UNMUTE
                        ? Events.ICON_STATE_UNMUTE
                : Events.ICON_STATE_UNKNOWN;
                : Events.ICON_STATE_UNKNOWN;
        if (iconEnabled) {
            if (isRingStream) {
                if (isRingVibrate) {
                    row.icon.setContentDescription(mContext.getString(
                            R.string.volume_stream_content_description_unmute,
                            ss.name));
                } else {
                    if (mController.hasVibrator()) {
                        row.icon.setContentDescription(mContext.getString(
                                R.string.volume_stream_content_description_vibrate,
                                ss.name));
                    } else {
                        row.icon.setContentDescription(mContext.getString(
                                R.string.volume_stream_content_description_mute,
                                ss.name));
                    }
                }
            } else {
                if (ss.muted || mAutomute && ss.level == 0) {
                   row.icon.setContentDescription(mContext.getString(
                           R.string.volume_stream_content_description_unmute,
                           ss.name));
                } else {
                    row.icon.setContentDescription(mContext.getString(
                            R.string.volume_stream_content_description_mute,
                            ss.name));
                }
            }
        } else {
            row.icon.setContentDescription(ss.name);
            row.icon.setContentDescription(ss.name);
        }


        // update slider
        // update slider
        final boolean enableSlider = !zenMuted;
        final boolean enableSlider = !zenMuted;