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

Commit 82a66557 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Revert addition of a11y stream in VolumeDialogController 

Revert addition of STREAM_ACCESSIBILITY as R.array.volume_stream_titles
  needs to contain STREAMS.length entries in all languages,
  whereas this had only been done for the default system language.

Test: boot in a different language than en-US
Bug: 33260083
Change-Id: If869c5f913bb42b94eeb3fa2e1b6f575a6f7ca70
parent d61cc80a

packages/SystemUI/res/values/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -1120,7 +1120,6 @@ 
        <item></item> <!-- STREAM_SYSTEM_ENFORCED -->

        <item></item> <!-- STREAM_DTMF -->

        <item></item> <!-- STREAM_TTS -->

        <item>Accessibility</item> <!-- STREAM_ACCESSIBILITY -->

    </string-array>



    <string name="volume_stream_muted" translatable="false">%s silent</string>

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

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ public class VolumeDialogController { 
        AudioSystem.STREAM_SYSTEM_ENFORCED,

        AudioSystem.STREAM_TTS,

        AudioSystem.STREAM_VOICE_CALL,

        AudioSystem.STREAM_ACCESSIBILITY,

    };



    private final HandlerThread mWorkerThread;