diff options
author | Stephen Bird <sbird@cyngn.com> | 2015-06-11 10:14:11 -0700 |
---|---|---|
committer | Stephen Bird <sbird@cyngn.com> | 2015-06-11 17:39:53 +0000 |
commit | 7d006588505d1ccc1a04cf9080851f0a7abeca66 (patch) | |
tree | 1157b731116a0982e095fcdf0de2ce0bc72f9abc /src | |
parent | d321030983ee100d0ef5ecef01ad99c840290c93 (diff) | |
download | android_packages_apps_Trebuchet-7d006588505d1ccc1a04cf9080851f0a7abeca66.tar.gz android_packages_apps_Trebuchet-7d006588505d1ccc1a04cf9080851f0a7abeca66.tar.bz2 android_packages_apps_Trebuchet-7d006588505d1ccc1a04cf9080851f0a7abeca66.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.
Change-Id: I55861da83f9b640fd767031e0f2188c5b9b91e66
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index f09f20b2a..170aa5f1c 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -5904,7 +5904,7 @@ public class Launcher extends Activity mGrid.layout(Launcher.this); // Synchronized reload - mModel.stopLoader(); //make sure the loader isn't running + 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 520e81bbd..2914d2324 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1537,7 +1537,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 */ |