summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fabian Kozynski <kozynski@google.com> 2019-08-19 16:25:57 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-19 16:25:57 -0700
commit39e543f166c629927fa53a87675694353596ddad (patch)
treebf1c3baa0c2c6c4fd9f9a4df997ec081cc8c068b
parenta977dfcbfcb0b9c662a90aa8a138d866628d19d2 (diff)
parent41aaa99f9b929608582138d789f5321346020b06 (diff)
Merge "Fix number of pages in PagedTileLayout" into qt-qpr1-dev
am: 41aaa99f9b Change-Id: I733fabb87ba5966545bb7495bf4e0ee89e5782ae
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
index 991d9fa549ac..0403a0505b00 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
@@ -248,7 +248,9 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
int numPages = Math.max(nTiles / mPages.get(0).maxTiles(), 1);
// Add one more not full page if needed
- numPages += (nTiles % mPages.get(0).maxTiles() == 0 ? 0 : 1);
+ if (nTiles > numPages * mPages.get(0).maxTiles()) {
+ numPages++;
+ }
final int NP = mPages.size();
for (int i = 0; i < NP; i++) {