diff options
| author | Yinglei Wang <yingleiw@google.com> | 2020-09-15 22:27:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-15 22:27:28 +0000 |
| commit | 953ba5c7ae88f27fbca8fc4a6c7e76efdedeb978 (patch) | |
| tree | dd9391c51251aef9ff2d8792acd17cd5c5c2f43a /core/java/android/widget/ProgressBar.java | |
| parent | bb076de2014bafe7f97b64f34802613359ea62f8 (diff) | |
| parent | 7419f4d018f7e7b575eaa7e6b5496586105c0bd1 (diff) | |
Merge "Add accessibility manager enabled check in progressbar" into rvc-qpr-dev am: 7419f4d018
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12539313
Change-Id: Ifac7d07800c10f830d193395a885e6689b7b1eb1
Diffstat (limited to 'core/java/android/widget/ProgressBar.java')
| -rw-r--r-- | core/java/android/widget/ProgressBar.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/widget/ProgressBar.java b/core/java/android/widget/ProgressBar.java index 4b32e10d083b..5b5468a3a252 100644 --- a/core/java/android/widget/ProgressBar.java +++ b/core/java/android/widget/ProgressBar.java @@ -54,6 +54,7 @@ import android.view.View; import android.view.ViewDebug; import android.view.ViewHierarchyEncoder; import android.view.accessibility.AccessibilityEvent; +import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityNodeInfo; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; @@ -310,9 +311,6 @@ public class ProgressBar extends View { setMax(a.getInt(R.styleable.ProgressBar_max, mMax)); setProgress(a.getInt(R.styleable.ProgressBar_progress, mProgress)); - // onProgressRefresh() is only called when the progress changes. So we should set - // stateDescription during initialization here. - super.setStateDescription(formatStateDescription(mProgress)); setSecondaryProgress(a.getInt( R.styleable.ProgressBar_secondaryProgress, mSecondaryProgress)); @@ -1616,7 +1614,8 @@ public class ProgressBar extends View { } void onProgressRefresh(float scale, boolean fromUser, int progress) { - if (mCustomStateDescription == null) { + if (AccessibilityManager.getInstance(mContext).isEnabled() + && mCustomStateDescription == null) { super.setStateDescription(formatStateDescription(mProgress)); } } @@ -2340,6 +2339,7 @@ public class ProgressBar extends View { AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_INT, getMin(), getMax(), getProgress()); info.setRangeInfo(rangeInfo); + info.setStateDescription(formatStateDescription(mProgress)); } } |