diff options
| author | Stephen Bird <sbird@cyngn.com> | 2015-06-11 10:14:11 -0700 |
|---|---|---|
| committer | Stephen Bird <sbird@cyngn.com> | 2015-06-11 11:55:58 -0700 |
| commit | 60b6aa9ddd3ae098fe6096e153b3f278d3d06055 (patch) | |
| tree | 3b60d7099e9ec23707758c836b5232e4539d3e55 | |
| parent | 9986a55e745d222a3a374b27b9f73f36bc49668b (diff) | |
| download | packages_apps_Trebuchet-60b6aa9ddd3ae098fe6096e153b3f278d3d06055.tar.gz packages_apps_Trebuchet-60b6aa9ddd3ae098fe6096e153b3f278d3d06055.tar.bz2 packages_apps_Trebuchet-60b6aa9ddd3ae098fe6096e153b3f278d3d06055.zip | |
Rotation: fix icons disappearing
Only the dynamic grid reload should be
stopping the launcher with intent to rebuild
the entire workspace.
This returns stopLoader to it's functionality
pre-dynamic grid resize patch.
(cherry picked from commit 7d006588505d1ccc1a04cf9080851f0a7abeca66)
(cherry picked from commit 36fcac12c25d0cc733ed0d4a90889d140434fd07)
Conflicts:
src/com/android/launcher3/Launcher.java
Change-Id: I55861da83f9b640fd767031e0f2188c5b9b91e66
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 1 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index a618150f0..af4022fb4 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -5665,6 +5665,7 @@ public class Launcher extends Activity mGrid.layout(Launcher.this); // Synchronized reload + mModel.resetLoadedState(true, true); mModel.startLoader(true, page); mWorkspace.updateCustomContentVisibility(); diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 3fa5863c9..99ad193b8 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1509,7 +1509,11 @@ public class LauncherModel extends BroadcastReceiver } public void stopLoader() { - resetLoadedState(true, true); + synchronized (mLock) { + if (mLoaderTask != null) { + mLoaderTask.stopLocked(); + } + } } /** Loads the workspace screens db into a map of Rank -> ScreenId */ |