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

Merge "Set stateDescription during ProgressBar initialization"

Browse Source
This commit is contained in:
Yinglei Wang
2020-01-23 03:12:13 +00:00
committed by Android (Google) Code Review
parent 2a8fae9828 20852a15ef
commit 51683fa8fa
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,6 @@ 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;
@@ -307,6 +306,9 @@ 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));
@@ -1599,8 +1601,7 @@ public class ProgressBar extends View {
}
void onProgressRefresh(float scale, boolean fromUser, int progress) {
if (AccessibilityManager.getInstance(mContext).isEnabled()
&& mCustomStateDescription == null) {
if (mCustomStateDescription == null) {
super.setStateDescription(formatStateDescription(mProgress));
}
}