am 6247641d: am 1d8e7bbe: Fix the bug where the icons stop showing up.

Merge commit '6247641dd9ea6b92e5aaee874f3e8573dc11fd9c' into eclair-mr2-plus-aosp

* commit '6247641dd9ea6b92e5aaee874f3e8573dc11fd9c':
  Fix the bug where the icons stop showing up.

src/com/android/launcher2/Launcher.java

@@ -227,6 +227,11 @@ public final class Launcher extends Activity
             android.os.Debug.stopMethodTracing();
         }
 
+        // We have a new AllAppsView, we need to re-bind everything, and it could have
+        // changed in our absence.
+        mModel.setAllAppsDirty();
+        mModel.setWorkspaceDirty();
+
         if (!mRestoring) {
             mModel.startLoader(this, true);
         }

src/com/android/launcher2/LauncherModel.java

@@ -249,6 +249,13 @@ public class LauncherModel {
         mLoader.stopLoader();
     }
 
+    /**
+     * We pick up most of the changes to all apps.
+     */
+    public void setAllAppsDirty() {
+        mLoader.setAllAppsDirty();
+    }
+
     public void setWorkspaceDirty() {
         mLoader.setWorkspaceDirty();
     }