From 6fcb1c4bd0f44986a214c5714552c854d974a0dc Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Mon, 7 Jul 2014 17:03:40 -0700
Subject: Trebuchet: always set initial wallpaper offsets

After a fresh boot, computeScrollOffset() always returns false. So the
result was the offsets were never properly being set on a fresh boot and
they were only being applied on first drag of the home screen, which
finally triggered computeScrollOffset() to return true.

Ref: QRDL-1001

Change-Id: Iccaedd742bed861fca1f50dd54e2e4537fd4c9b0
(cherry picked from commit 30f86c21b7513f2bed1009375ff5242c60661bf9)
---
 src/com/android/launcher3/Workspace.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/com/android')

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 464b9b303..1cfa6850f 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1355,6 +1355,7 @@ public class Workspace extends SmoothPagedView
         // Don't use all the wallpaper for parallax until you have at least this many pages
         private final int MIN_PARALLAX_PAGE_SPAN = 3;
         int mNumScreens;
+        boolean mCompletedInitialOffset;
 
         public WallpaperOffsetInterpolator() {
             mChoreographer = Choreographer.getInstance();
@@ -1369,7 +1370,8 @@ public class Workspace extends SmoothPagedView
         private void updateOffset(boolean force) {
             if (mWaitingForUpdate || force) {
                 mWaitingForUpdate = false;
-                if (computeScrollOffset() && mWindowToken != null) {
+                if ((!mCompletedInitialOffset || computeScrollOffset()) && mWindowToken != null) {
+                    mCompletedInitialOffset = true;
                     try {
                         mWallpaperManager.setWallpaperOffsets(mWindowToken,
                                 mWallpaperOffset.getCurrX(), 0.5f);
-- 
cgit v1.2.3