From 25886a160bbc001ef51a9459edaf5c3f010c7229 Mon Sep 17 00:00:00 2001
From: Chet Haase
Date: Wed, 28 Mar 2018 18:26:53 -0700
Subject: Fix bug and docs assuming progressBar min is 0 instead of getMin()
This code and docs predates the existence of get/setMin() on ProgressBar,
should have been updated when we introduced the new min property.
Test: Ran TalkBack
Bug: 74357845
Change-Id: I318f26bb8ecacc5ecdbf7d026d8568f871cf2369
---
core/java/android/widget/ProgressBar.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java
index ced66cd275ea..e7c3a47348d0 100644
--- a/core/java/android/widget/ProgressBar.java
+++ b/core/java/android/widget/ProgressBar.java
@@ -1373,7 +1373,7 @@ public class ProgressBar extends View {
* indicator. To animate the visual position to the target value, use
* {@link #setProgress(int, boolean)}}.
*
- * @param progress the new progress, between 0 and {@link #getMax()}
+ * @param progress the new progress, between {@link #getMin()} and {@link #getMax()}
*
* @see #setIndeterminate(boolean)
* @see #isIndeterminate()
@@ -1392,7 +1392,7 @@ public class ProgressBar extends View {
* Animation does not affect the result of {@link #getProgress()}, which
* will return the target value immediately after this method is called.
*
- * @param progress the new progress value, between 0 and {@link #getMax()}
+ * @param progress the new progress value, between {@link #getMin()} and {@link #getMax()}
* @param animate {@code true} to animate between the current and target
* values or {@code false} to not animate
*/
@@ -1425,7 +1425,8 @@ public class ProgressBar extends View {
* anything if the progress bar is in indeterminate mode.
*
*
- * @param secondaryProgress the new secondary progress, between 0 and {@link #getMax()}
+ * @param secondaryProgress the new secondary progress, between {@link #getMin()} and
+ * {@link #getMax()}
* @see #setIndeterminate(boolean)
* @see #isIndeterminate()
* @see #getSecondaryProgress()
@@ -1455,7 +1456,7 @@ public class ProgressBar extends View {
* Get the progress bar's current level of progress. Return 0 when the
* progress bar is in indeterminate mode.
*
- * @return the current progress, between 0 and {@link #getMax()}
+ * @return the current progress, between {@link #getMin()} and {@link #getMax()}
*
* @see #setIndeterminate(boolean)
* @see #isIndeterminate()
@@ -1472,7 +1473,7 @@ public class ProgressBar extends View {
* Get the progress bar's current level of secondary progress. Return 0 when the
* progress bar is in indeterminate mode.
*
- * @return the current secondary progress, between 0 and {@link #getMax()}
+ * @return the current secondary progress, between {@link #getMin()} and {@link #getMax()}
*
* @see #setIndeterminate(boolean)
* @see #isIndeterminate()
@@ -1990,7 +1991,8 @@ public class ProgressBar extends View {
if (!isIndeterminate()) {
AccessibilityNodeInfo.RangeInfo rangeInfo = AccessibilityNodeInfo.RangeInfo.obtain(
- AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_INT, 0, getMax(), getProgress());
+ AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_INT, getMin(), getMax(),
+ getProgress());
info.setRangeInfo(rangeInfo);
}
}
--
cgit v1.2.3-59-g8ed1b