commit be34ef61a350ec7beebda84cf8630a80fbe8725b
author Tony Wickham <twickham@google.com> Tue Sep 21 15:43:54 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 21 15:43:54 2021 +0000
tree c5211b3707c57faae88d6f5d39a597459e30bff6
parent 3bbebe24394bf3b7723978b2b7f90773d276d6f0
parent bab101c81813a40797189e5100a8ceb49b05fd4c

Merge "Take panel count into account for page indicator size" into sc-v2-dev

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index a7198a8..d534c5d 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -208,7 +208,7 @@
     public void initParentViews(View parent) {
         if (mPageIndicatorViewId > -1) {
             mPageIndicator = parent.findViewById(mPageIndicatorViewId);
-            mPageIndicator.setMarkersCount(getChildCount());
+            mPageIndicator.setMarkersCount(getChildCount() / getPanelCount());
         }
     }
 
@@ -830,7 +830,7 @@
 
     private void dispatchPageCountChanged() {
         if (mPageIndicator != null) {
-            mPageIndicator.setMarkersCount(getChildCount());
+            mPageIndicator.setMarkersCount(getChildCount() / getPanelCount());
         }
         // This ensures that when children are added, they get the correct transforms / alphas
         // in accordance with any scroll effects.