resolve merge conflicts of 2953833bcb to ub-launcher3-calgary

Change-Id: Ia7fc406d1e287974e87979af9a4b1f5f1e4e23d9

src/com/android/launcher3/Launcher.java

@@ -123,6 +123,7 @@ import java.io.PrintWriter;
 import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -4815,6 +4816,14 @@ public class Launcher extends Activity
     public static HashMap<String, CustomAppWidget> getCustomAppWidgets() {
         return sCustomAppWidgets;
     }
+
+    public static List<View> getFolderContents(View icon) {
+        if (icon instanceof FolderIcon) {
+            return ((FolderIcon) icon).getFolder().getItemsInReadingOrder();
+        } else {
+            return Collections.EMPTY_LIST;
+        }
+    }
 }
 
 interface DebugIntents {