commit 20bd2c10c1d5ead86f472a7397f060159693e4f4
author Tony Wickham <twickham@google.com> Fri Sep 18 20:41:14 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 18 20:41:14 2015 +0000
tree 9ec39284e230e73d47d6bebea574daea3d83c26c
parent a3c9fb125c7449df5add990e91e0e3471e3cc776
parent 6ed058cb6bfbb5756721e0d7f4a80a1c08ee665c

am 6ed058cb: Wallpaper preview parallax matches the actual wallpaper\'s.

* commit '6ed058cb6bfbb5756721e0d7f4a80a1c08ee665c':
  Wallpaper preview parallax matches the actual wallpaper's.

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 352e51b..5f88966 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -748,6 +748,9 @@
             return;
         } else if (requestCode == REQUEST_PICK_WALLPAPER) {
             if (resultCode == RESULT_OK && mWorkspace.isInOverviewMode()) {
+                // User could have free-scrolled between pages before picking a wallpaper; make sure
+                // we move to the closest one now to avoid visual jump.
+                mWorkspace.setCurrentPage(mWorkspace.getPageNearestToCenterOfScreen());
                 showWorkspace(false);
             }
             return;