From 60b6aa9ddd3ae098fe6096e153b3f278d3d06055 Mon Sep 17 00:00:00 2001
From: Stephen Bird <sbird@cyngn.com>
Date: Thu, 11 Jun 2015 10:14:11 -0700
Subject: 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
---
 src/com/android/launcher3/Launcher.java      | 1 +
 src/com/android/launcher3/LauncherModel.java | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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 */
-- 
cgit v1.2.3