Trebuchet : Live folder removeAll fix

Relayout folder in event that the folder is removed of all
its contents.
Also allow apps to clear folder contents.

Change-Id: Idb79d102fa26dcb1920fca18b9dfa3267baa94b0

3 files changed, 2 insertions, 5 deletions

diff --git a/src/com/cyanogenmod/trebuchet/Folder.java b/src/com/cyanogenmod/trebuchet/Folder.java
index 80bda330d..6d3a2f64d 100644
--- a/src/com/cyanogenmod/trebuchet/Folder.java
+++ b/src/com/cyanogenmod/trebuchet/Folder.java
@@ -1154,6 +1154,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
     public void onAllItemsRemoved() {
         mItemsInvalidated = true;
         mContent.removeAllViews();
+        setupContentForNumItems(getItemCount());
         replaceFolderWithFinalItem();
     }
 
diff --git a/src/com/cyanogenmod/trebuchet/LiveFolderInfo.java b/src/com/cyanogenmod/trebuchet/LiveFolderInfo.java
index 19ce90613..abd7c2969 100644
--- a/src/com/cyanogenmod/trebuchet/LiveFolderInfo.java
+++ b/src/com/cyanogenmod/trebuchet/LiveFolderInfo.java
@@ -1,7 +1,6 @@
 package com.cyanogenmod.trebuchet;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 
 import org.cyanogenmod.support.ui.LiveFolder;
 
@@ -26,7 +25,6 @@ import android.text.TextUtils;
 class LiveFolderInfo extends FolderInfo {
 
     ComponentName receiver;
-    long lastUpdate;
     Intent.ShortcutIconResource iconResource;
 
     LiveFolderInfo() {
@@ -68,7 +66,6 @@ class LiveFolderInfo extends FolderInfo {
     }
 
     public void populateWithItems(Context ctx, ArrayList<LiveFolder.Item> items) {
-        lastUpdate = System.currentTimeMillis();
         removeAll();
         Bitmap icon = null;
         for (LiveFolder.Item item : items) {
diff --git a/src/com/cyanogenmod/trebuchet/LiveFoldersReceiver.java b/src/com/cyanogenmod/trebuchet/LiveFoldersReceiver.java
index 46853bba9..056341346 100644
--- a/src/com/cyanogenmod/trebuchet/LiveFoldersReceiver.java
+++ b/src/com/cyanogenmod/trebuchet/LiveFoldersReceiver.java
@@ -49,8 +49,7 @@ public class LiveFoldersReceiver extends BroadcastReceiver {
         // Verify item list
         ArrayList<LiveFolder.Item> items = intent.getParcelableArrayListExtra(
                 FOLDER_ENTRIES_EXTRA);
-        if (items == null || items.isEmpty()) {
-            Log.e(TAG, "Cannot populate with empty items");
+        if (items == null) {
             return;
         }