commit ed273c22c47ad84c550a59b5f233a97f4141ee28
author Anjali Koppal <akoppal@google.com> Thu Mar 13 00:23:48 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 13 00:23:48 2014 +0000
tree 5203f2af5a66ece36ded5e319ff19e96a8f20f0b
parent fe845c4ed122adfdd09695f21e5dac12660022e6
parent fc4787f7be3f05a3e8ccb393be1aaa5c9610c154

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

* commit 'fc4787f7be3f05a3e8ccb393be1aaa5c9610c154':
  Make FolderIcon.getFolder() public and add Folder.getContent().

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index b4c3992..fb226e5 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -303,6 +303,10 @@
         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

diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java
index 78026f1..71a7461 100644
--- a/src/com/android/launcher3/FolderIcon.java
+++ b/src/com/android/launcher3/FolderIcon.java
@@ -308,7 +308,7 @@
         }
     }
 
-    Folder getFolder() {
+    public Folder getFolder() {
         return mFolder;
     }