commit fcd19dfcd3afb5f047444e86843d583b8bd53966
author Tony Wickham <twickham@google.com> Fri Sep 18 19:52:32 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 18 19:52:32 2015 +0000
tree 87cec045c7db4f59353604b434458a74d61dfb32
parent 26bfdd9d5a0cc590d78a849d3401b52c02494a2c
parent e30544196043bec0cd9b33a89594497f94a6f91f

Merge "Ensure that setting a wallpaper snaps to a page." into ub-launcher3-master

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index d695e34..6df7cd8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -706,6 +706,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.
+                mWorkspace.setCurrentPage(mWorkspace.getPageNearestToCenterOfScreen());
                 showWorkspace(false);
             }
             return;