commit 72f0fe370dbb44d03afb149001e090d88288cab7
author Sunny Goyal <sunnygoyal@google.com> Wed Jun 08 22:27:08 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 08 22:27:08 2016 +0000
tree 9968c53766ff14c16f9a180851c51b813221408b
parent 1fa6b9499b4cf435c41e52d76bc74a2ce6121d40
parent 3333b0ced8e6743c41909f6f6b916f1f9ec5a004

Merge "Unifying focus indicator handling for workspace and all-apps" into ub-launcher3-calgary

src/com/android/launcher3/pageindicators/PageIndicatorDots.java

diff --git a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java
index 7d84a0c..99af93b 100644
--- a/src/com/android/launcher3/pageindicators/PageIndicatorDots.java
+++ b/src/com/android/launcher3/pageindicators/PageIndicatorDots.java
@@ -24,7 +24,6 @@
 import android.animation.ValueAnimator.AnimatorUpdateListener;
 import android.content.Context;
 import android.graphics.Canvas;
-import android.view.animation.Interpolator;
 import android.graphics.Outline;
 import android.graphics.Paint;
 import android.graphics.Paint.Style;
@@ -33,6 +32,7 @@
 import android.util.Property;
 import android.view.View;
 import android.view.ViewOutlineProvider;
+import android.view.animation.Interpolator;
 import android.view.animation.OvershootInterpolator;
 
 import com.android.launcher3.R;
@@ -224,8 +224,14 @@
 
     @Override
     public void setActiveMarker(int activePage) {
-        mActivePage = activePage;
-        invalidate();
+        if (mActivePage != activePage) {
+            mActivePage = activePage;
+
+            // Simulate a scroll change
+            int totalScroll = mNumPages - 1;
+            int currentScroll = mIsRtl ? (totalScroll - mActivePage) : mActivePage;
+            setScroll(currentScroll, totalScroll);
+        }
     }
 
     @Override