summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fabian Kozynski <kozynski@google.com> 2019-08-14 13:36:18 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-14 13:36:18 -0700
commita0873a6228eadb2b5161b99cfe632fa5a90df4c6 (patch)
tree849749bdc15e2bbd844ad038158d9b186a326fca
parent452082a55773afc07b6c1c85974c113c47ceb540 (diff)
parenta5206a73b57b9df451d2fe1b07448b3802848fbf (diff)
Merge "Fix number of pages in PagedTileLayout" into qt-qpr1-dev am: 41aaa99f9b
am: a5206a73b5 Change-Id: Ice3d8bde73d209f95b7ddb62dde7d769c5d67dd6
-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++) {