1 files changed, 15 insertions, 3 deletions
diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java
index 17ea4899d..c7e0abfb6 100644
--- a/src/com/android/launcher3/FolderIcon.java
+++ b/src/com/android/launcher3/FolderIcon.java
@@ -30,6 +30,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Looper;
 import android.os.Parcelable;
 import android.util.AttributeSet;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -172,9 +173,9 @@ public class FolderIcon extends FrameLayout implements FolderListener {
                 folderInfo.title));
         Folder folder;
         if (folderInfo.isRemote()) {
-            folder = launcher.getRemoteFolderManager().createRemoteFolder(icon);
+            folder = launcher.getRemoteFolderManager().createRemoteFolder(icon, launcher.getDragLayer());
         } else {
-            folder = Folder.fromXml(launcher);
+            folder = Folder.fromXml(launcher, launcher.getDragLayer());
         }
         folder.setDragController(launcher.getDragController());
         folder.setFolderIcon(icon);
@@ -237,6 +238,11 @@ public class FolderIcon extends FrameLayout implements FolderListener {
             }
         }
 
+        // Create an overlay badge if this FolderIcon is for a RemoteFolder
+        if (folderInfo.isRemote()) {
+            icon = RemoteFolderManager.addBadgeToFolderIcon(icon);
+        }
+
         return icon;
     }
 
@@ -726,7 +732,7 @@ public class FolderIcon extends FrameLayout implements FolderListener {
         }
 
         if (!mAnimating) {
-            for (int i = NUM_ITEMS_IN_PREVIEW; i >= 0; i--) {
+            for (int i = 0; i < NUM_ITEMS_IN_PREVIEW; i++) {
                 d = null;
                 if (i < items.size()) {
                     v = (TextView) items.get(i);
@@ -835,6 +841,12 @@ public class FolderIcon extends FrameLayout implements FolderListener {
         requestLayout();
     }
 
+    @Override
+    public void onRemoveAll() {
+        invalidate();
+        requestLayout();
+    }
+
     public void onTitleChanged(CharSequence title) {
         mFolderName.setText(title.toString());
         setContentDescription(String.format(getContext().getString(R.string.folder_name_format),