commit 6c9a1262be2c6f67f94a2b28cd46f0faa2496cd5
author Phil Weaver <pweaver@google.com> Fri Aug 18 20:20:47 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 18 20:20:47 2017 +0000
tree 9e1ba654f3f387ef7f58d7fc0dfadcc9ee8e79d6
parent 268c6c6ca66cb9656f921a72355637821e1d6ec8
parent b605a4e2013337774a4e9b04eca5bf388c437234

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

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

diff --git a/src/com/android/settings/widget/LabeledSeekBar.java b/src/com/android/settings/widget/LabeledSeekBar.java
index f1a6788..8e5a30b 100644
--- a/src/com/android/settings/widget/LabeledSeekBar.java
+++ b/src/com/android/settings/widget/LabeledSeekBar.java
@@ -201,6 +201,7 @@
             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;
         }