Shrink-wrapped folders

Change-Id: Ida1b5d0bd4d39eabfde9f8a5bee0d4b6e9b33627

12 files changed, 39 insertions, 77 deletions

diff --git a/res/drawable-hdpi/folder_bg.9.png b/res/drawable-hdpi/folder_bg.9.png
deleted file mode 100644
index 6f1bbe548..000000000
--- a/res/drawable-hdpi/folder_bg.9.png
+++ /dev/null
diff --git a/res/drawable-hdpi/portal_container_holo.9.png b/res/drawable-hdpi/portal_container_holo.9.png
new file mode 100644
index 000000000..af2fa98d7
--- /dev/null
+++ b/res/drawable-hdpi/portal_container_holo.9.png
diff --git a/res/drawable-hdpi/portal_ring_inner_holo.png b/res/drawable-hdpi/portal_ring_inner_holo.png
new file mode 100644
index 000000000..8a9e85b7f
--- /dev/null
+++ b/res/drawable-hdpi/portal_ring_inner_holo.png
diff --git a/res/drawable-hdpi/portal_ring_outer_holo.png b/res/drawable-hdpi/portal_ring_outer_holo.png
new file mode 100644
index 000000000..5b4641946
--- /dev/null
+++ b/res/drawable-hdpi/portal_ring_outer_holo.png
diff --git a/res/drawable-mdpi/folder_bg.9.png b/res/drawable-mdpi/folder_bg.9.png
deleted file mode 100644
index 6f1bbe548..000000000
--- a/res/drawable-mdpi/folder_bg.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/portal_container_holo.9.png b/res/drawable-mdpi/portal_container_holo.9.png
new file mode 100644
index 000000000..42aca5f51
--- /dev/null
+++ b/res/drawable-mdpi/portal_container_holo.9.png
diff --git a/res/drawable-mdpi/portal_ring_inner_holo.png b/res/drawable-mdpi/portal_ring_inner_holo.png
new file mode 100644
index 000000000..4a6469488
--- /dev/null
+++ b/res/drawable-mdpi/portal_ring_inner_holo.png
diff --git a/res/drawable-mdpi/portal_ring_outer_holo.png b/res/drawable-mdpi/portal_ring_outer_holo.png
new file mode 100644
index 000000000..90cf77fa8
--- /dev/null
+++ b/res/drawable-mdpi/portal_ring_outer_holo.png
diff --git a/res/layout-land/user_folder.xml b/res/layout-land/user_folder.xml
index b81446287..87499e71e 100644
--- a/res/layout-land/user_folder.xml
+++ b/res/layout-land/user_folder.xml
@@ -18,44 +18,23 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
     android:orientation="vertical"
-    android:background="@drawable/folder_bg">
-    
-    <Button
-        android:id="@+id/folder_close"
-    	android:background="@drawable/box_launcher_top"
-        android:gravity="left|center_vertical"
-        android:textSize="14sp"
-        android:textColor="#404040"
-        android:textStyle="bold"
-        android:layout_width="match_parent"
-    	android:layout_height="wrap_content" />
-
-    <FrameLayout
-         android:layout_width="match_parent"
-         android:layout_height="0dip"
-         android:layout_weight="1">
-
-        <com.android.launcher2.CellLayout
-             android:id="@id/folder_content"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-
-             android:cacheColorHint="#ff333333"
-
-             launcher:cellWidth="@dimen/folder_cell_width"
-             launcher:cellHeight="@dimen/folder_cell_height"
-             launcher:xAxisStartPadding="0dip"
-             launcher:xAxisEndPadding="0dip"
-             launcher:yAxisStartPadding="0dip"
-             launcher:yAxisEndPadding="0dip"
-
-             android:scrollbarAlwaysDrawVerticalTrack="true"
-             android:scrollbarStyle="insideInset"
-             android:drawSelectorOnTop="false"
-             android:listSelector="@drawable/grid_selector"
-
-             android:verticalSpacing="10dip"
-             android:numColumns="5" />
-    </FrameLayout>
+    android:background="@drawable/portal_container_holo">
+
+    <com.android.launcher2.CellLayout
+        android:id="@id/folder_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+
+        android:cacheColorHint="#ff333333"
+
+        android:hapticFeedbackEnabled="false"
+        launcher:widthGap="@dimen/workspace_width_gap"
+        launcher:heightGap="@dimen/workspace_height_gap"
+        launcher:cellWidth="@dimen/workspace_cell_width"
+        launcher:cellHeight="@dimen/workspace_cell_height"
+        launcher:xAxisStartPadding="0dip"
+        launcher:xAxisEndPadding="0dip"
+        launcher:yAxisStartPadding="8dip"
+        launcher:yAxisEndPadding="8dip"/>
 
 </com.android.launcher2.Folder>
diff --git a/res/layout-port/user_folder.xml b/res/layout-port/user_folder.xml
index 4901eb219..0d383c177 100644
--- a/res/layout-port/user_folder.xml
+++ b/res/layout-port/user_folder.xml
@@ -18,44 +18,23 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
     android:orientation="vertical"
-    android:background="@drawable/folder_bg">
+    android:background="@drawable/portal_container_holo">
 
-    <Button
-        android:id="@+id/folder_close"
-	android:background="@drawable/box_launcher_top"
-        android:gravity="left|center_vertical"
-        android:textSize="14sp"
-        android:textColor="#404040"
-        android:textStyle="bold"
+    <com.android.launcher2.CellLayout
+        android:id="@id/folder_content"
         android:layout_width="match_parent"
-    	android:layout_height="wrap_content" />
-
-    <FrameLayout
-         android:layout_width="match_parent"
-         android:layout_height="0dip"
-         android:layout_weight="1">
-
-        <com.android.launcher2.CellLayout
-             android:id="@id/folder_content"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-
-             android:cacheColorHint="#ff333333"
-
-             launcher:cellWidth="@dimen/folder_cell_width"
-             launcher:cellHeight="@dimen/folder_cell_height"
-             launcher:xAxisStartPadding="0dip"
-             launcher:xAxisEndPadding="0dip"
-             launcher:yAxisStartPadding="0dip"
-             launcher:yAxisEndPadding="0dip"
-
-             android:scrollbarAlwaysDrawVerticalTrack="true"
-             android:scrollbarStyle="insideInset"
-             android:drawSelectorOnTop="false"
-             android:listSelector="@drawable/grid_selector"
-
-             android:verticalSpacing="10dip"
-             android:numColumns="5" />
-    </FrameLayout>
+        android:layout_height="match_parent"
+
+        android:cacheColorHint="#ff333333"
+
+        android:hapticFeedbackEnabled="false"
+        launcher:widthGap="@dimen/workspace_width_gap"
+        launcher:heightGap="@dimen/workspace_height_gap"
+        launcher:cellWidth="@dimen/workspace_cell_width"
+        launcher:cellHeight="@dimen/workspace_cell_height"
+        launcher:xAxisStartPadding="0dip"
+        launcher:xAxisEndPadding="0dip"
+        launcher:yAxisStartPadding="8dip"
+        launcher:yAxisEndPadding="8dip"/>
 
 </com.android.launcher2.Folder>
diff --git a/res/values/config.xml b/res/values/config.xml
index 0aa1ee49e..1cc019b75 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -56,7 +56,7 @@
     <integer name="config_dropAnimMaxDuration">400</integer>
 
     <!-- The duration of the UserFolder opening and closing animation -->
-    <integer name="config_folderAnimDuration">150</integer>
+    <integer name="config_folderAnimDuration">100</integer>
 
     <!-- The distance at which the animation should take the max duration -->
     <integer name="config_dropAnimMaxDist">800</integer>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 62e55d2e2..99b124097 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -67,4 +67,8 @@
      the drag view should be offset from the position of the original view. -->
     <dimen name="dragViewOffsetX">0dp</dimen>
     <dimen name="dragViewOffsetY">-8dp</dimen>
+
+    <!-- Width/height gap overrides for the workspace -->
+    <dimen name="workspace_width_gap">-1dp</dimen>
+    <dimen name="workspace_height_gap">-1dp</dimen>
 </resources>