summaryrefslogtreecommitdiff
path: root/core/java/android/widget/ProgressBar.java
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2018-03-28 18:26:53 -0700
committerPhil Weaver <pweaver@google.com>2018-04-24 17:23:58 +0000
commitbb5f10924cfbb943a36424d2d94ce19494c68040 (patch)
treec8cda04f706546537a4a50f3834dfda8ffb7d01c /core/java/android/widget/ProgressBar.java
parentcd8d257d42faad1323fc80b9bc38df72780aa804 (diff)
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 (cherry picked from commit 25886a160bbc001ef51a9459edaf5c3f010c7229)
Diffstat (limited to 'core/java/android/widget/ProgressBar.java')
-rw-r--r--core/java/android/widget/ProgressBar.java14
1 files 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.
* </p>
*
- * @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 {
* <p>Get the progress bar's current level of progress. Return 0 when the
* progress bar is in indeterminate mode.</p>
*
- * @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 {
* <p>Get the progress bar's current level of secondary progress. Return 0 when the
* progress bar is in indeterminate mode.</p>
*
- * @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);
}
}