Merge "Ensure a11y ids for LabeledSeekBar are in bounds" into oc-mr1-dev

am: 6c9a1262be

Change-Id: Iecdcc2b66a665b86be2f9fd0686619e758e2b7f4

src/com/android/settings/widget/LabeledSeekBar.java

@@ -201,6 +201,7 @@ public class LabeledSeekBar extends SeekBar {
             int posBase = Math.max(0,
                     ((int) x - LabeledSeekBar.this.getPaddingStart()) / getHalfVirtualViewWidth());
             posBase = (posBase + 1) / 2;
+            posBase = Math.min(posBase, LabeledSeekBar.this.getMax());
             return mIsLayoutRtl ? LabeledSeekBar.this.getMax() - posBase : posBase;
         }