Merge "Add accessibility manager enabled check in progressbar" (c65102f7) · Commits · e / os / android_frameworks_base

core/java/android/widget/ProgressBar.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -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;
		@@ -314,9 +315,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));
		@@ -1627,7 +1625,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));
		}
		}
		@@ -2351,6 +2350,7 @@ public class ProgressBar extends View {
		AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_INT, getMin(), getMax(),
		getProgress());
		info.setRangeInfo(rangeInfo);
		info.setStateDescription(formatStateDescription(mProgress));
		}
		}