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

am: 6c9a1262be

Change-Id: Iecdcc2b66a665b86be2f9fd0686619e758e2b7f4
This commit is contained in:
Phil Weaver
2017-08-18 20:41:57 +00:00
committed by android-build-merger

View File

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