Merge "Always update PageIndicator visibility" into rvc-dev am: fc0a625874
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11738043 Change-Id: Ibfbdb94fd8fee49fbcaa28e4994409b3e1771665
This commit is contained in:
@@ -45,9 +45,6 @@ public class PageIndicator extends ViewGroup {
|
||||
}
|
||||
|
||||
public void setNumPages(int numPages) {
|
||||
if (numPages == getChildCount()) {
|
||||
return;
|
||||
}
|
||||
TypedArray array = getContext().obtainStyledAttributes(
|
||||
new int[]{android.R.attr.colorControlActivated});
|
||||
int color = array.getColor(0, 0);
|
||||
@@ -55,12 +52,12 @@ public class PageIndicator extends ViewGroup {
|
||||
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) {
|
||||
setVisibility(numPages > 1 ? View.VISIBLE : View.GONE);
|
||||
if (numPages == getChildCount()) {
|
||||
return;
|
||||
}
|
||||
setVisibility(numPages > 1 ? View.VISIBLE : View.GONE);
|
||||
if (mAnimating) {
|
||||
Log.w(TAG, "setNumPages during animation");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user