From 82a6655714ea5c87da5fc79725596d2d211b38e2 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Thu, 1 Dec 2016 08:46:06 -0800
Subject: [PATCH] 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
---
 packages/SystemUI/res/values/strings.xml                         | 1 -
 .../src/com/android/systemui/volume/VolumeDialogController.java  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 5fec64777a057..331d09e4537a2 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -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>
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
index 5393d60e4eddb..ec0e4cd1d7b6d 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
@@ -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;