Merge "Added min support to ProgressBar and SeekBar" (00a981e5) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -855,6 +855,7 @@ package android {
		field public static final int mediaRouteTypes = 16843694; // 0x10103ae
		field public static final int menuCategory = 16843230; // 0x10101de
		field public static final int mimeType = 16842790; // 0x1010026
		field public static final int min = 16843367; // 0x1010267
		field public static final int minDate = 16843583; // 0x101033f
		field public static final int minEms = 16843098; // 0x101015a
		field public static final int minHeight = 16843072; // 0x1010140
		@@ -47475,6 +47476,7 @@ package android.widget {
		method public android.graphics.PorterDuff.Mode getIndeterminateTintMode();
		method public android.view.animation.Interpolator getInterpolator();
		method public synchronized int getMax();
		method public synchronized int getMin();
		method public synchronized int getProgress();
		method public android.content.res.ColorStateList getProgressBackgroundTintList();
		method public android.graphics.PorterDuff.Mode getProgressBackgroundTintMode();
		@@ -47497,6 +47499,7 @@ package android.widget {
		method public void setInterpolator(android.content.Context, int);
		method public void setInterpolator(android.view.animation.Interpolator);
		method public synchronized void setMax(int);
		method public synchronized void setMin(int);
		method public synchronized void setProgress(int);
		method public void setProgress(int, boolean);
		method public void setProgressBackgroundTintList(android.content.res.ColorStateList);

api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -962,6 +962,7 @@ package android {
		field public static final int mediaRouteTypes = 16843694; // 0x10103ae
		field public static final int menuCategory = 16843230; // 0x10101de
		field public static final int mimeType = 16842790; // 0x1010026
		field public static final int min = 16843367; // 0x1010267
		field public static final int minDate = 16843583; // 0x101033f
		field public static final int minEms = 16843098; // 0x101015a
		field public static final int minHeight = 16843072; // 0x1010140
		@@ -51014,6 +51015,7 @@ package android.widget {
		method public android.graphics.PorterDuff.Mode getIndeterminateTintMode();
		method public android.view.animation.Interpolator getInterpolator();
		method public synchronized int getMax();
		method public synchronized int getMin();
		method public synchronized int getProgress();
		method public android.content.res.ColorStateList getProgressBackgroundTintList();
		method public android.graphics.PorterDuff.Mode getProgressBackgroundTintMode();
		@@ -51036,6 +51038,7 @@ package android.widget {
		method public void setInterpolator(android.content.Context, int);
		method public void setInterpolator(android.view.animation.Interpolator);
		method public synchronized void setMax(int);
		method public synchronized void setMin(int);
		method public synchronized void setProgress(int);
		method public void setProgress(int, boolean);
		method public void setProgressBackgroundTintList(android.content.res.ColorStateList);

api/test-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -855,6 +855,7 @@ package android {
		field public static final int mediaRouteTypes = 16843694; // 0x10103ae
		field public static final int menuCategory = 16843230; // 0x10101de
		field public static final int mimeType = 16842790; // 0x1010026
		field public static final int min = 16843367; // 0x1010267
		field public static final int minDate = 16843583; // 0x101033f
		field public static final int minEms = 16843098; // 0x101015a
		field public static final int minHeight = 16843072; // 0x1010140
		@@ -47568,6 +47569,7 @@ package android.widget {
		method public android.graphics.PorterDuff.Mode getIndeterminateTintMode();
		method public android.view.animation.Interpolator getInterpolator();
		method public synchronized int getMax();
		method public synchronized int getMin();
		method public synchronized int getProgress();
		method public android.content.res.ColorStateList getProgressBackgroundTintList();
		method public android.graphics.PorterDuff.Mode getProgressBackgroundTintMode();
		@@ -47590,6 +47592,7 @@ package android.widget {
		method public void setInterpolator(android.content.Context, int);
		method public void setInterpolator(android.view.animation.Interpolator);
		method public synchronized void setMax(int);
		method public synchronized void setMin(int);
		method public synchronized void setProgress(int);
		method public void setProgress(int, boolean);
		method public void setProgressBackgroundTintList(android.content.res.ColorStateList);

core/java/android/widget/AbsSeekBar.java

+27 −10

Original line number	Diff line number	Diff line
		@@ -469,7 +469,7 @@ public abstract class AbsSeekBar extends ProgressBar {
		/**
		* Returns the amount of progress changed via the arrow keys.
		* <p>
		* By default, this will be a value that is derived from the max progress.
		* By default, this will be a value that is derived from the progress range.
		*
		* @return The amount to increment or decrement when the user presses the
		* arrow keys. This will be positive.
		@@ -478,14 +478,28 @@ public abstract class AbsSeekBar extends ProgressBar {
		return mKeyProgressIncrement;
		}

		@Override
		public synchronized void setMin(int min) {
		super.setMin(min);
		int range = getMax() - getMin();

		if ((mKeyProgressIncrement == 0) \|\| (range / mKeyProgressIncrement > 20)) {

		// It will take the user too long to change this via keys, change it
		// to something more reasonable
		setKeyProgressIncrement(Math.max(1, Math.round((float) range / 20)));
		}
		}

		@Override
		public synchronized void setMax(int max) {
		super.setMax(max);
		int range = getMax() - getMin();

		if ((mKeyProgressIncrement == 0) \|\| (getMax() / mKeyProgressIncrement > 20)) {
		if ((mKeyProgressIncrement == 0) \|\| (range / mKeyProgressIncrement > 20)) {
		// It will take the user too long to change this via keys, change it
		// to something more reasonable
		setKeyProgressIncrement(Math.max(1, Math.round((float) getMax() / 20)));
		setKeyProgressIncrement(Math.max(1, Math.round((float) range / 20)));
		}
		}

		@@ -596,8 +610,10 @@ public abstract class AbsSeekBar extends ProgressBar {
		}

		private float getScale() {
		final int max = getMax();
		return max > 0 ? getProgress() / (float) max : 0;
		int min = getMin();
		int max = getMax();
		int range = max - min;
		return range > 0 ? (getProgress() - min) / (float) range : 0;
		}

		/**
		@@ -691,7 +707,7 @@ public abstract class AbsSeekBar extends ProgressBar {
		*/
		void drawTickMarks(Canvas canvas) {
		if (mTickMark != null) {
		final int count = getMax();
		final int count = getMax() - getMin();
		if (count > 1) {
		final int w = mTickMark.getIntrinsicWidth();
		final int h = mTickMark.getIntrinsicHeight();
		@@ -847,8 +863,8 @@ public abstract class AbsSeekBar extends ProgressBar {
		}
		}

		final int max = getMax();
		progress += scale * max;
		final int range = getMax() - getMin();
		progress += scale * range;

		setHotspot(x, y);
		setProgressInternal(Math.round(progress), true, false);
		@@ -922,7 +938,7 @@ public abstract class AbsSeekBar extends ProgressBar {

		if (isEnabled()) {
		final int progress = getProgress();
		if (progress > 0) {
		if (progress > getMin()) {
		info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_SCROLL_BACKWARD);
		}
		if (progress < getMax()) {
		@@ -960,7 +976,8 @@ public abstract class AbsSeekBar extends ProgressBar {
		if (!canUserSetProgress()) {
		return false;
		}
		int increment = Math.max(1, Math.round((float) getMax() / 20));
		int range = getMax() - getMin();
		int increment = Math.max(1, Math.round((float) range / 20));
		if (action == AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD) {
		increment = -increment;
		}

core/java/android/widget/ProgressBar.java

+65 −9

Original line number	Diff line number	Diff line
		@@ -186,6 +186,7 @@ import java.util.ArrayList;
		* @attr ref android.R.styleable#ProgressBar_indeterminateDuration
		* @attr ref android.R.styleable#ProgressBar_indeterminateOnly
		* @attr ref android.R.styleable#ProgressBar_interpolator
		* @attr ref android.R.styleable#ProgressBar_min
		* @attr ref android.R.styleable#ProgressBar_max
		* @attr ref android.R.styleable#ProgressBar_maxHeight
		* @attr ref android.R.styleable#ProgressBar_maxWidth
		@@ -216,7 +217,10 @@ public class ProgressBar extends View {

		private int mProgress;
		private int mSecondaryProgress;
		private int mMin;
		private boolean mMinInitialized;
		private int mMax;
		private boolean mMaxInitialized;

		private int mBehavior;
		private int mDuration;
		@@ -309,6 +313,7 @@ public class ProgressBar extends View {
		setInterpolator(context, resID);
		}

		setMin(a.getInt(R.styleable.ProgressBar_min, mMin));
		setMax(a.getInt(R.styleable.ProgressBar_max, mMax));

		setProgress(a.getInt(R.styleable.ProgressBar_progress, mProgress));
		@@ -565,6 +570,7 @@ public class ProgressBar extends View {
		* </ul>
		*/
		private void initProgressBar() {
		mMin = 0;
		mMax = 100;
		mProgress = 0;
		mSecondaryProgress = 0;
		@@ -1310,7 +1316,8 @@ public class ProgressBar extends View {

		private synchronized void doRefreshProgress(int id, int progress, boolean fromUser,
		boolean callBackToApp, boolean animate) {
		final float scale = mMax > 0 ? progress / (float) mMax : 0;
		int range = mMax - mMin;
		final float scale = range > 0 ? (progress - mMin) / (float) range : 0;
		final boolean isPrimary = id == R.id.progress;

		if (isPrimary && animate) {
		@@ -1436,7 +1443,7 @@ public class ProgressBar extends View {
		return false;
		}

		progress = MathUtils.constrain(progress, 0, mMax);
		progress = MathUtils.constrain(progress, mMin, mMax);

		if (progress == mProgress) {
		// No change from current.
		@@ -1466,8 +1473,8 @@ public class ProgressBar extends View {
		return;
		}

		if (secondaryProgress < 0) {
		secondaryProgress = 0;
		if (secondaryProgress < mMin) {
		secondaryProgress = mMin;
		}

		if (secondaryProgress > mMax) {
		@@ -1514,6 +1521,20 @@ public class ProgressBar extends View {
		return mIndeterminate ? 0 : mSecondaryProgress;
		}

		/**
		* <p>Return the lower limit of this progress bar's range.</p>
		*
		* @return a positive integer
		*
		* @see #setMin(int)
		* @see #getProgress()
		* @see #getSecondaryProgress()
		*/
		@ViewDebug.ExportedProperty(category = "progress")
		public synchronized int getMin() {
		return mMin;
		}

		/**
		* <p>Return the upper limit of this progress bar's range.</p>
		*
		@@ -1529,7 +1550,37 @@ public class ProgressBar extends View {
		}

		/**
		* <p>Set the range of the progress bar to 0...<tt>max</tt>.</p>
		* <p>Set the lower range of the progress bar to <tt>min</tt>.</p>
		*
		* @param min the lower range of this progress bar
		*
		* @see #getMin()
		* @see #setProgress(int)
		* @see #setSecondaryProgress(int)
		*/
		@android.view.RemotableViewMethod
		public synchronized void setMin(int min) {
		if (mMaxInitialized) {
		if (min > mMax) {
		min = mMax;
		}
		}
		mMinInitialized = true;
		if (mMaxInitialized && min != mMin) {
		mMin = min;
		postInvalidate();

		if (mProgress < min) {
		mProgress = min;
		}
		refreshProgress(R.id.progress, mProgress, false, false);
		} else {
		mMin = min;
		}
		}

		/**
		* <p>Set the upper range of the progress bar <tt>max</tt>.</p>
		*
		* @param max the upper range of this progress bar
		*
		@@ -1539,10 +1590,13 @@ public class ProgressBar extends View {
		*/
		@android.view.RemotableViewMethod
		public synchronized void setMax(int max) {
		if (max < 0) {
		max = 0;
		if (mMinInitialized) {
		if (max < mMin) {
		max = mMin;
		}
		if (max != mMax) {
		}
		mMaxInitialized = true;
		if (mMinInitialized && max != mMax) {
		mMax = max;
		postInvalidate();

		@@ -1550,6 +1604,8 @@ public class ProgressBar extends View {
		mProgress = max;
		}
		refreshProgress(R.id.progress, mProgress, false, false);
		} else {
		mMax = max;
		}
		}

		@@ -1959,7 +2015,7 @@ public class ProgressBar extends View {
		@Override
		public void onInitializeAccessibilityEventInternal(AccessibilityEvent event) {
		super.onInitializeAccessibilityEventInternal(event);
		event.setItemCount(mMax);
		event.setItemCount(mMax - mMin);
		event.setCurrentItemIndex(mProgress);
		}