Merge "Make FolderIcon.getFolder() public and add Folder.getContent()." into ub-now-mister-ugly

src/com/android/launcher3/Folder.java

@@ -303,6 +303,10 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
         return mFolderName;
     }
 
+    public CellLayout getContent() {
+        return mContent;
+    }
+
     /**
      * We need to handle touch events to prevent them from falling through to the workspace below.
      */

src/com/android/launcher3/FolderIcon.java

@@ -308,7 +308,7 @@ public class FolderIcon extends FrameLayout implements FolderListener {
         }
     }
 
-    Folder getFolder() {
+    public Folder getFolder() {
         return mFolder;
     }