Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add accessibility manager enabled check in progressbar" into rvc-qpr-dev am: 7419f4d018

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12539313

Change-Id: Ifac7d07800c10f830d193395a885e6689b7b1eb1
This commit is contained in:
Yinglei Wang
2020-09-15 22:27:28 +00:00
committed by Automerger Merge Worker
parent bb076de201 7419f4d018
commit 953ba5c7ae
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/ProgressBar.java
View File

@@ -54,6 +54,7 @@ import android.view.View;
import android.view.ViewDebug; import android.view.ViewDebug;
import android.view.ViewHierarchyEncoder; import android.view.ViewHierarchyEncoder;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;
import android.view.animation.AlphaAnimation; import android.view.animation.AlphaAnimation;
import android.view.animation.Animation; import android.view.animation.Animation;
@@ -310,9 +311,6 @@ public class ProgressBar extends View {
setMax(a.getInt(R.styleable.ProgressBar_max, mMax)); setMax(a.getInt(R.styleable.ProgressBar_max, mMax));
setProgress(a.getInt(R.styleable.ProgressBar_progress, mProgress)); 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( setSecondaryProgress(a.getInt(
R.styleable.ProgressBar_secondaryProgress, mSecondaryProgress)); R.styleable.ProgressBar_secondaryProgress, mSecondaryProgress));
@@ -1616,7 +1614,8 @@ public class ProgressBar extends View {
} }
void onProgressRefresh(float scale, boolean fromUser, int progress) { void onProgressRefresh(float scale, boolean fromUser, int progress) {
if (mCustomStateDescription == null) { if (AccessibilityManager.getInstance(mContext).isEnabled()
&& mCustomStateDescription == null) {
super.setStateDescription(formatStateDescription(mProgress)); super.setStateDescription(formatStateDescription(mProgress));
} }
} }
@@ -2340,6 +2339,7 @@ public class ProgressBar extends View {
AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_INT, getMin(), getMax(), AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_INT, getMin(), getMax(),
getProgress()); getProgress());
info.setRangeInfo(rangeInfo); info.setRangeInfo(rangeInfo);
info.setStateDescription(formatStateDescription(mProgress));
} }
} }