Merge "DO NOT MERGE: Merge Oreo MR1 into master"
diff --git a/src/com/android/musicfx/ActivityMusic.java b/src/com/android/musicfx/ActivityMusic.java
index 29c4c4a..03f3397 100644
--- a/src/com/android/musicfx/ActivityMusic.java
+++ b/src/com/android/musicfx/ActivityMusic.java
@@ -275,6 +275,10 @@
         setContentView(R.layout.music_main);
         final ViewGroup viewGroup = (ViewGroup) findViewById(R.id.contentSoundEffects);
 
+        // Set accessibility label for bass boost and virtualizer strength seekbars.
+        findViewById(R.id.bBStrengthText).setLabelFor(R.id.bBStrengthSeekBar);
+        findViewById(R.id.vIStrengthText).setLabelFor(R.id.vIStrengthSeekBar);
+
         // Fill array with presets from AudioEffects call.
         // allocate a space for 2 extra strings (CI Extreme & User)
         final int numPresets = ControlPanelEffect.getParameterInt(mContext, mCallingPackageName,
@@ -663,6 +667,8 @@
                     format("%.0f ", centerFreqHz) + unitPrefix + "Hz");
             mEqualizerSeekBar[band] = (SeekBar) eqcontainer
                     .findViewById(EQViewElementIds[band][1]);
+            eqcontainer.findViewById(EQViewElementIds[band][0])
+                    .setLabelFor(EQViewElementIds[band][1]);
             mEqualizerSeekBar[band].setMax(mEqualizerMaxBandLevel - mEqualizerMinBandLevel);
             mEqualizerSeekBar[band].setOnSeekBarChangeListener(this);
         }