From e30544196043bec0cd9b33a89594497f94a6f91f Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 9 Sep 2015 09:05:25 -0700
Subject: [PATCH] Ensure that setting a wallpaper snaps to a page.

Previously it was possible to end in a sort of limbo state between pages if the
user free scrolled in the overview before entering the wallpaper picker.

Bug: 23829077

Change-Id: I2837fb46f092efac3b3274043378431963e6eabc
---
 src/com/android/launcher3/Launcher.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 35d08baa4e..7722f6e06f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -704,6 +704,9 @@ public class Launcher extends Activity
             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;