From 84b237f491dadaa155376a57d4100ff27a59397f Mon Sep 17 00:00:00 2001
From: Raj Yengisetty <rajesh@cyngn.com>
Date: Thu, 14 Aug 2014 10:45:42 -0700
Subject: When reloading dynamic grid, reload restore page first.

Change-Id: I05c1d1faf61ecd79abf15d4ab84a689b7e0cb2ac
---
 src/com/android/launcher3/Launcher.java               | 8 ++++++--
 src/org/cyanogenmod/trebuchet/CustomHomeLauncher.java | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 01a52d4e9..fdbe841a6 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -5028,6 +5028,10 @@ public class Launcher extends Activity
     }
 
     public void updateDynamicGrid() {
+        updateDynamicGrid(mWorkspace.getRestorePage());
+    }
+
+    public void updateDynamicGrid(int page) {
         mSearchDropTargetBar.setupQSB(Launcher.this);
 
         initializeDynamicGrid();
@@ -5035,7 +5039,7 @@ public class Launcher extends Activity
         mGrid.layout(Launcher.this);
 
         // Synchronized reload
-        mModel.startLoader(true, mWorkspace.getCurrentPage());
+        mModel.startLoader(true, page);
         mWorkspace.updateCustomContentVisibility();
 
     }
@@ -5046,7 +5050,7 @@ public class Launcher extends Activity
 
     public boolean updateGridIfNeeded() {
         if (mDynamicGridUpdateRequired) {
-            updateDynamicGrid();
+            updateDynamicGrid(mWorkspace.getCurrentPage());
             mDynamicGridUpdateRequired = false;
             return true;
         }
diff --git a/src/org/cyanogenmod/trebuchet/CustomHomeLauncher.java b/src/org/cyanogenmod/trebuchet/CustomHomeLauncher.java
index 47c9c3b2c..649b81091 100644
--- a/src/org/cyanogenmod/trebuchet/CustomHomeLauncher.java
+++ b/src/org/cyanogenmod/trebuchet/CustomHomeLauncher.java
@@ -236,8 +236,8 @@ public class CustomHomeLauncher extends Launcher {
     }
 
     @Override
-    public void updateDynamicGrid() {
-        super.updateDynamicGrid();
+    public void updateDynamicGrid(int page) {
+        super.updateDynamicGrid(page);
 
         if (isCustomContentModeGel() && mCurrentHomeApp != null) {
             mCurrentHomeApp.mInstance.setShowContent(false);
-- 
cgit v1.2.3