From 1936ec048ca612f4651d6b2f18390bae8c4ac936 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 12 May 2015 11:03:04 -0700
Subject: [PATCH] Removing empty folders in loader

Bug: 21050720
Change-Id: Id174bb1e18b070e32273d66649f0e286e3546f89
---
 src/com/android/launcher3/LauncherModel.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 3987c02079..658a3e2879 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2331,6 +2331,22 @@ public class LauncherModel extends BroadcastReceiver
                     return;
                 }
 
+                // Remove any empty folder
+                LongArrayMap<FolderInfo> emptyFolders = sBgFolders.clone();
+                for (ItemInfo item: sBgItemsIdMap) {
+                    long container = item.container;
+                    if (emptyFolders.containsKey(container)) {
+                        emptyFolders.remove(container);
+                    }
+                }
+                for (FolderInfo folder : emptyFolders) {
+                    long folderId = folder.id;
+                    sBgFolders.remove(folderId);
+                    sBgItemsIdMap.remove(folderId);
+                    sBgWorkspaceItems.remove(folder);
+                    itemsToRemove.add(folderId);
+                }
+
                 if (itemsToRemove.size() > 0) {
                     ContentProviderClient client = contentResolver.acquireContentProviderClient(
                             contentUri);