diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2014-08-14 10:45:42 -0700 |
|---|---|---|
| committer | Matt Garnes <matt@cyngn.com> | 2014-08-15 21:34:45 +0000 |
| commit | 84b237f491dadaa155376a57d4100ff27a59397f (patch) | |
| tree | e7a92390505b6b8225bda74fce8742678f40a9d4 | |
| parent | 3493881701556f359d29dba1be9f53b5fbb8d85b (diff) | |
| download | android_packages_apps_Trebuchet-84b237f491dadaa155376a57d4100ff27a59397f.tar.gz android_packages_apps_Trebuchet-84b237f491dadaa155376a57d4100ff27a59397f.tar.bz2 android_packages_apps_Trebuchet-84b237f491dadaa155376a57d4100ff27a59397f.zip | |
When reloading dynamic grid, reload restore page first.
Change-Id: I05c1d1faf61ecd79abf15d4ab84a689b7e0cb2ac
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 8 | ||||
| -rw-r--r-- | 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); |