Merge "Always update PageIndicator visibility" into rvc-dev (fc0a6258) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -45,9 +45,6 @@ public class PageIndicator extends ViewGroup {
	}		}

	public void setNumPages(int numPages) {		public void setNumPages(int numPages) {
	if (numPages == getChildCount()) {
	return;
	}
	TypedArray array = getContext().obtainStyledAttributes(		TypedArray array = getContext().obtainStyledAttributes(
	new int[]{android.R.attr.colorControlActivated});		new int[]{android.R.attr.colorControlActivated});
	int color = array.getColor(0, 0);		int color = array.getColor(0, 0);
	@@ -55,12 +52,12 @@ public class PageIndicator extends ViewGroup {
	setNumPages(numPages, color);		setNumPages(numPages, color);
	}		}

	/** Oveload of setNumPages that allows the indicator color to be specified.*/		/** Overload of setNumPages that allows the indicator color to be specified.*/
	public void setNumPages(int numPages, int color) {		public void setNumPages(int numPages, int color) {
			setVisibility(numPages > 1 ? View.VISIBLE : View.GONE);
	if (numPages == getChildCount()) {		if (numPages == getChildCount()) {
	return;		return;
	}		}
	setVisibility(numPages > 1 ? View.VISIBLE : View.GONE);
	if (mAnimating) {		if (mAnimating) {
	Log.w(TAG, "setNumPages during animation");		Log.w(TAG, "setNumPages during animation");
	}		}