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

Merge "Always update PageIndicator visibility" into rvc-dev am: fc0a625874 am: 20b6f7ff1a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11738043

Change-Id: I88de977cef57320da7db5fd9bb73b5162608b66c
This commit is contained in:
Beverly Tai
2020-06-05 01:04:32 +00:00
committed by Automerger Merge Worker
parent 27583ad0e9 20b6f7ff1a
commit ca7e2078d9
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/qs/PageIndicator.java
View File

@@ -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");
} }