Making folders scrollable

Change-Id: Id6c9ec62acc6d86dc627d20abad3e2d92010f539

6 files changed, 42 insertions, 33 deletions

diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index 8c72dd673..3eeec35a2 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -22,20 +22,25 @@
     android:orientation="vertical"
     android:background="@drawable/portal_container_holo">
 
-    <com.android.launcher3.CellLayout
-        android:id="@+id/folder_content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="@dimen/folder_padding"
-        android:paddingEnd="@dimen/folder_padding"
-        android:paddingTop="@dimen/folder_padding"
-        android:paddingBottom="@dimen/folder_padding"
-        android:cacheColorHint="#ff333333"
-        android:hapticFeedbackEnabled="false"
-        launcher:widthGap="@dimen/folder_width_gap"
-        launcher:heightGap="@dimen/folder_height_gap"
-        launcher:cellWidth="@dimen/folder_cell_width"
-        launcher:cellHeight="@dimen/folder_cell_height" />
+    <ScrollView
+        android:id="@+id/scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+      <com.android.launcher3.CellLayout
+          android:id="@+id/folder_content"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:paddingStart="@dimen/folder_padding"
+          android:paddingEnd="@dimen/folder_padding"
+          android:paddingTop="@dimen/folder_padding"
+          android:paddingBottom="@dimen/folder_padding"
+          android:cacheColorHint="#ff333333"
+          android:hapticFeedbackEnabled="false"
+          launcher:widthGap="@dimen/folder_width_gap"
+          launcher:heightGap="@dimen/folder_height_gap"
+          launcher:cellWidth="@dimen/folder_cell_width"
+          launcher:cellHeight="@dimen/folder_cell_height" />
+    </ScrollView>
 
     <com.android.launcher3.FolderEditText
         android:id="@+id/folder_name"
diff --git a/res/values-land/config.xml b/res/values-land/config.xml
index fc20456c3..da9f9f982 100644
--- a/res/values-land/config.xml
+++ b/res/values-land/config.xml
@@ -21,8 +21,10 @@
     <!-- Whether or not to fade the side pages -->
     <bool name="config_workspaceFadeAdjacentScreens">false</bool>
 
-    <!-- Folder max bounds and max number of items.
-         Note: folder_max_count_x * folder_max_count_y >= folder_max_num_items. -->
+    <!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
+         >= folder_max_num_items. If any values are set to 0, the values will be determined automatically.
+         A value of -1 indicates unbounded -->
     <integer name="folder_max_count_x">6</integer>
-    <integer name="folder_max_count_y">3</integer>
+    <integer name="folder_max_count_y">-1</integer>
+    <integer name="folder_max_num_items">-1</integer>
 </resources>
diff --git a/res/values-sw600dp-land/config.xml b/res/values-sw600dp-land/config.xml
index 822ea8995..3e8a92b55 100644
--- a/res/values-sw600dp-land/config.xml
+++ b/res/values-sw600dp-land/config.xml
@@ -1,7 +1,8 @@
 <resources>
-<!-- Folders -->
-    <!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
-        >= folder_max_num_items. When these are set to -1, they are automatically determined. -->
+<!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
+     >= folder_max_num_items. If any values are set to 0, the values will be determined automatically.
+     A value of -1 indicates unbounded -->
     <integer name="folder_max_count_x">8</integer>
-    <integer name="folder_max_count_y">5</integer>
+    <integer name="folder_max_count_y">-1</integer>
+    <integer name="folder_max_num_items">-1</integer>
 </resources>
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml
index fe8827418..d657d4311 100644
--- a/res/values-sw600dp/config.xml
+++ b/res/values-sw600dp/config.xml
@@ -11,12 +11,12 @@
 <!-- DragController -->
     <integer name="config_flingToDeleteMinVelocity">-1000</integer>
 
-<!-- Folders -->
-    <!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
-        >= folder_max_num_items. When these are set to -1, they are automatically determined. -->
+<!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
+     >= folder_max_num_items. If any values are set to 0, the values will be determined automatically.
+     A value of -1 indicates unbounded -->
     <integer name="folder_max_count_x">6</integer>
-    <integer name="folder_max_count_y">6</integer>
-    <integer name="folder_max_num_items">36</integer>
+    <integer name="folder_max_count_y">-1</integer>
+    <integer name="folder_max_num_items">-1</integer>
 
     <!-- Camera distance for the overscroll effect. We use a higher value here because the 
          workspace screens run nearly flush to the edge of the screen-->
diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml
index 7c8d3d2e0..03e5f9ce3 100644
--- a/res/values-sw720dp/config.xml
+++ b/res/values-sw720dp/config.xml
@@ -10,10 +10,10 @@
     <!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
     <integer name="config_workspaceSpringLoadShrinkPercentage">90</integer>
 
-<!-- Folders -->
-    <!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
-        >= folder_max_num_items. When these are set to -1, they are automatically determined. -->
-    <integer name="folder_max_count_x">-1</integer>
+<!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
+     >= folder_max_num_items. If any values are set to 0, the values will be determined automatically.
+     A value of -1 indicates unbounded -->
+    <integer name="folder_max_count_x">0</integer>
     <integer name="folder_max_count_y">-1</integer>
     <integer name="folder_max_num_items">-1</integer>
 
diff --git a/res/values/config.xml b/res/values/config.xml
index 2c691a4ce..4aec434ce 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -70,10 +70,11 @@
     <integer name="config_cameraDistance">6500</integer>
 
     <!-- Folder max bounds and max number of items. Note: folder_max_count_x * folder_max_count_y
-         >= folder_max_num_items. When these are set to -1, they are automatically determined. -->
+         >= folder_max_num_items. If any values are set to 0, the values will be determined automatically.
+         A value of -1 indicates unbounded -->
     <integer name="folder_max_count_x">4</integer>
-    <integer name="folder_max_count_y">4</integer>
-    <integer name="folder_max_num_items">16</integer>
+    <integer name="folder_max_count_y">-1</integer>
+    <integer name="folder_max_num_items">-1</integer>
 
     <integer name="cell_count_x">4</integer>
     <integer name="cell_count_y">4</integer>