commit f7296c373ac14f194a35f0cc760e6565ddfa13f1
author Winson Chung <winsonc@google.com> Tue Aug 02 20:01:31 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 02 20:01:32 2016 +0000
tree 5fae06d299780b141ffb847e67d260200a308ec0
parent 278958e922e4b318193388bc99879a917a2225c8
parent 5bc2827488a53dad60e3b66a27c6deda78f3d83f

Merge "Adding workaround to jump in wallpaper offsets." into ub-launcher3-calgary

src/com/android/launcher3/util/WallpaperOffsetInterpolator.java

diff --git a/src/com/android/launcher3/util/WallpaperOffsetInterpolator.java b/src/com/android/launcher3/util/WallpaperOffsetInterpolator.java
index d7b3914..3926974 100644
--- a/src/com/android/launcher3/util/WallpaperOffsetInterpolator.java
+++ b/src/com/android/launcher3/util/WallpaperOffsetInterpolator.java
@@ -208,8 +208,9 @@
         scheduleUpdate();
         mFinalOffset = Math.max(0f, Math.min(x, 1f));
         if (getNumScreensExcludingEmptyAndCustom() != mNumScreens) {
-            if (mNumScreens > 0) {
-                // Don't animate if we're going from 0 screens
+            if (mNumScreens > 0 && Float.compare(mCurrentOffset, mFinalOffset) != 0) {
+                // Don't animate if we're going from 0 screens, or if the final offset is the same
+                // as the current offset
                 animateToFinal();
             }
             mNumScreens = getNumScreensExcludingEmptyAndCustom();