From 4b825dcd5f64a5ebb60271844fbc5257374422bc Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Sun, 19 Jun 2011 12:41:22 -0700
Subject: Tweaking launcher grid and spacing.

Change-Id: I369a87f473d1e870b2f819221f6383aab340b067
---
 res/layout-land/folder_icon.xml                    |  2 +-
 res/layout-land/workspace_screen.xml               | 30 --------------
 res/layout-large-land/workspace_screen.xml         | 33 ---------------
 res/layout-large-port/workspace_screen.xml         | 33 ---------------
 .../all_apps_paged_view_application.xml            |  2 +-
 res/layout-large/workspace_screen.xml              | 33 +++++++++++++++
 res/layout-port/folder_icon.xml                    |  2 +-
 res/layout-port/workspace_screen.xml               | 30 --------------
 res/layout/apps_customize_application.xml          |  2 +-
 res/layout/user_folder.xml                         | 12 +++---
 res/layout/workspace_screen.xml                    | 33 +++++++++++++++
 res/values-land/dimens.xml                         | 13 ++++--
 res/values-large-land/dimens.xml                   | 12 +++++-
 res/values-large-port/dimens.xml                   |  9 ++++
 res/values-large/dimens.xml                        | 28 ++++---------
 res/values-large/styles.xml                        | 48 ++++++++++++++++------
 res/values-port/dimens.xml                         | 15 +++++--
 res/values/attrs.xml                               | 11 +----
 res/values/dimens.xml                              | 18 ++++----
 res/values/styles.xml                              | 38 ++++++++++-------
 20 files changed, 193 insertions(+), 211 deletions(-)
 delete mode 100644 res/layout-land/workspace_screen.xml
 delete mode 100644 res/layout-large-land/workspace_screen.xml
 delete mode 100644 res/layout-large-port/workspace_screen.xml
 create mode 100644 res/layout-large/workspace_screen.xml
 delete mode 100644 res/layout-port/workspace_screen.xml
 create mode 100644 res/layout/workspace_screen.xml

(limited to 'res')

diff --git a/res/layout-land/folder_icon.xml b/res/layout-land/folder_icon.xml
index 60569c553..e9d2b960a 100644
--- a/res/layout-land/folder_icon.xml
+++ b/res/layout-land/folder_icon.xml
@@ -28,5 +28,5 @@
         android:src="@drawable/portal_ring_inner_holo"/>
     <com.android.launcher2.BubbleTextView
         android:id="@+id/folder_name"
-        style="@style/WorkspaceIcon.Landscape"/>
+        style="@style/WorkspaceIcon.Landscape.Folder"/>
 </com.android.launcher2.FolderIcon>
diff --git a/res/layout-land/workspace_screen.xml b/res/layout-land/workspace_screen.xml
deleted file mode 100644
index a9faf892f..000000000
--- a/res/layout-land/workspace_screen.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.launcher2.CellLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:hapticFeedbackEnabled="false"
-
-    launcher:cellWidth="@dimen/workspace_cell_width"
-    launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:xAxisStartPadding="@dimen/qsb_bar_height"
-    launcher:xAxisEndPadding="0dip"
-    launcher:yAxisStartPadding="0dip"
-    launcher:yAxisEndPadding="0dip"/>
diff --git a/res/layout-large-land/workspace_screen.xml b/res/layout-large-land/workspace_screen.xml
deleted file mode 100644
index 25b05e903..000000000
--- a/res/layout-large-land/workspace_screen.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.launcher2.CellLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:hapticFeedbackEnabled="false"
-
-    launcher:cellWidth="@dimen/workspace_cell_width"
-    launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:widthGap="@dimen/workspace_width_gap_land"
-    launcher:heightGap="@dimen/workspace_height_gap_land"
-
-    launcher:xAxisStartPadding="@dimen/workspace_x_axis_start_padding_land"
-    launcher:xAxisEndPadding="@dimen/workspace_x_axis_end_padding_land"
-    launcher:yAxisStartPadding="@dimen/workspace_y_axis_start_padding_land"
-    launcher:yAxisEndPadding="@dimen/workspace_y_axis_end_padding_land" />
diff --git a/res/layout-large-port/workspace_screen.xml b/res/layout-large-port/workspace_screen.xml
deleted file mode 100644
index e33c6123e..000000000
--- a/res/layout-large-port/workspace_screen.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.launcher2.CellLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:hapticFeedbackEnabled="false"
-
-    launcher:cellWidth="@dimen/workspace_cell_width"
-    launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:widthGap="@dimen/workspace_width_gap_port"
-    launcher:heightGap="@dimen/workspace_height_gap_port"
-
-    launcher:xAxisStartPadding="@dimen/workspace_x_axis_start_padding_port"
-    launcher:xAxisEndPadding="@dimen/workspace_x_axis_end_padding_port"
-    launcher:yAxisStartPadding="@dimen/workspace_y_axis_start_padding_port"
-    launcher:yAxisEndPadding="@dimen/workspace_y_axis_end_padding_port" />
diff --git a/res/layout-large/all_apps_paged_view_application.xml b/res/layout-large/all_apps_paged_view_application.xml
index 16e5d82b7..019f75f40 100644
--- a/res/layout-large/all_apps_paged_view_application.xml
+++ b/res/layout-large/all_apps_paged_view_application.xml
@@ -21,7 +21,7 @@
     launcher:blurColor="#FF6B8CF0"
     launcher:outlineColor="#FF8CD2FF"
 
-    style="@style/WorkspaceIcon.AllApps"
+    style="@style/WorkspaceIcon.AppsCustomize"
 
     android:id="@+id/application_icon"
     android:layout_width="match_parent"
diff --git a/res/layout-large/workspace_screen.xml b/res/layout-large/workspace_screen.xml
new file mode 100644
index 000000000..52f9defd9
--- /dev/null
+++ b/res/layout-large/workspace_screen.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.launcher2.CellLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingLeft="@dimen/workspace_left_padding"
+    android:paddingRight="@dimen/workspace_right_padding"
+    android:paddingTop="@dimen/workspace_top_padding"
+    android:paddingBottom="@dimen/workspace_bottom_padding"
+    android:hapticFeedbackEnabled="false"
+
+    launcher:cellWidth="@dimen/workspace_cell_width"
+    launcher:cellHeight="@dimen/workspace_cell_height"
+    launcher:widthGap="@dimen/workspace_width_gap"
+    launcher:heightGap="@dimen/workspace_height_gap"
+    launcher:maxGap="@dimen/workspace_max_gap" />
diff --git a/res/layout-port/folder_icon.xml b/res/layout-port/folder_icon.xml
index 3f776dec0..adc0e6a06 100644
--- a/res/layout-port/folder_icon.xml
+++ b/res/layout-port/folder_icon.xml
@@ -28,5 +28,5 @@
         android:src="@drawable/portal_ring_inner_holo"/>
     <com.android.launcher2.BubbleTextView
         android:id="@+id/folder_name"
-        style="@style/WorkspaceIcon.Portrait"/>
+        style="@style/WorkspaceIcon.Portrait.Folder"/>
 </com.android.launcher2.FolderIcon>
diff --git a/res/layout-port/workspace_screen.xml b/res/layout-port/workspace_screen.xml
deleted file mode 100644
index 7a6714fe0..000000000
--- a/res/layout-port/workspace_screen.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.android.launcher2.CellLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:hapticFeedbackEnabled="false"
-
-    launcher:cellWidth="@dimen/workspace_cell_width"
-    launcher:cellHeight="@dimen/workspace_cell_height"
-    launcher:yAxisStartPadding="@dimen/qsb_bar_height"
-    launcher:yAxisEndPadding="@dimen/button_bar_height"
-    launcher:xAxisStartPadding="0dip"
-    launcher:xAxisEndPadding="0dip" />
diff --git a/res/layout/apps_customize_application.xml b/res/layout/apps_customize_application.xml
index 4f3632632..37a8df7ee 100644
--- a/res/layout/apps_customize_application.xml
+++ b/res/layout/apps_customize_application.xml
@@ -18,7 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
 
-    style="@style/WorkspaceIcon.AllApps"
+    style="@style/WorkspaceIcon.AppsCustomize"
 
     android:id="@+id/application_icon"
     android:layout_width="match_parent"
diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml
index 06d79ef70..299095d11 100644
--- a/res/layout/user_folder.xml
+++ b/res/layout/user_folder.xml
@@ -30,16 +30,16 @@
         android:id="@+id/folder_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:paddingLeft="0dip"
+        android:paddingRight="0dip"
+        android:paddingTop="8dip"
+        android:paddingBottom="8dip"
         android:cacheColorHint="#ff333333"
         android:hapticFeedbackEnabled="false"
         launcher:widthGap="@dimen/folder_width_gap"
         launcher:heightGap="@dimen/folder_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"/>
+        launcher:cellHeight="@dimen/workspace_cell_height" />
 
     <EditText
         android:id="@+id/folder_name"
@@ -54,4 +54,4 @@
         android:textColor="#FFF"
         android:gravity="center_horizontal"
         android:singleLine="true"/>
-</com.android.launcher2.Folder>
\ No newline at end of file
+</com.android.launcher2.Folder>
diff --git a/res/layout/workspace_screen.xml b/res/layout/workspace_screen.xml
new file mode 100644
index 000000000..ede0d9907
--- /dev/null
+++ b/res/layout/workspace_screen.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.launcher2.CellLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/workspace_left_padding"
+    android:paddingRight="@dimen/workspace_right_padding"
+    android:paddingTop="@dimen/workspace_top_padding"
+    android:paddingBottom="@dimen/workspace_bottom_padding"
+    android:hapticFeedbackEnabled="false"
+
+    launcher:cellWidth="@dimen/workspace_cell_width"
+    launcher:cellHeight="@dimen/workspace_cell_height"
+    launcher:widthGap="-1dp"
+    launcher:heightGap="-1dp"
+    launcher:maxGap="@dimen/workspace_max_gap" />
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 13519e568..6ba7f7d0e 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -19,8 +19,12 @@
     <dimen name="toolbar_button_vertical_padding">12dip</dimen>
     <dimen name="toolbar_button_horizontal_padding">12dip</dimen>
 
-    <dimen name="workspace_cell_width">106dip</dimen>
-    <dimen name="workspace_cell_height">74dip</dimen>
+<!-- Workspace -->
+    <dimen name="workspace_left_padding">@dimen/qsb_bar_height</dimen>
+    <dimen name="workspace_right_padding">@dimen/button_bar_height</dimen>
+    <dimen name="workspace_top_padding">0dp</dimen>
+    <dimen name="workspace_bottom_padding">0dp</dimen>
+
     <dimen name="folder_cell_width">100dip</dimen>
     <dimen name="folder_cell_height">74dip</dimen>
     <dimen name="button_bar_height">62dip</dimen>
@@ -29,11 +33,12 @@
     <integer name="all_apps_view_cellCountY">3</integer>
     <dimen name="all_apps_view_pageLayoutWidthGap">10dp</dimen>
     <dimen name="all_apps_view_pageLayoutHeightGap">5dp</dimen>
-    <dimen name="all_apps_view_pageLayoutPaddingTop">10dp</dimen>
-    <dimen name="all_apps_view_pageLayoutPaddingBottom">10dp</dimen>
+    <dimen name="all_apps_view_pageLayoutPaddingTop">4dp</dimen>
+    <dimen name="all_apps_view_pageLayoutPaddingBottom">4dp</dimen>
     <dimen name="all_apps_view_pageLayoutPaddingLeft">2dp</dimen>
     <dimen name="all_apps_view_pageLayoutPaddingRight">2dp</dimen>
 
+<!-- AppsCustomize -->
     <dimen name="apps_customize_widget_cell_width_gap">30dp</dimen>
     <dimen name="apps_customize_widget_cell_height_gap">0dp</dimen>
     <integer name="apps_customize_widget_cell_count_x">3</integer>
diff --git a/res/values-large-land/dimens.xml b/res/values-large-land/dimens.xml
index eeb16f4d4..8a5dfd3a4 100644
--- a/res/values-large-land/dimens.xml
+++ b/res/values-large-land/dimens.xml
@@ -15,12 +15,20 @@
 -->
 
 <resources>
+<!-- Workspace -->
+    <dimen name="workspace_left_padding">25dip</dimen>
+    <dimen name="workspace_right_padding">25dip</dimen>
+    <dimen name="workspace_top_padding">15dip</dimen>
+    <dimen name="workspace_bottom_padding">15dip</dimen>
+    <dimen name="workspace_width_gap">32dp</dimen>
+    <dimen name="workspace_height_gap">2dp</dimen>
+
     <!-- the area at the edge of the screen that makes the workspace go left
          or right while you're dragging. -->
     <dimen name="scroll_zone">100dip</dimen>
 
-    <dimen name="all_apps_view_pageLayoutWidthGap">36dp</dimen>
-    <dimen name="all_apps_view_pageLayoutHeightGap">6dp</dimen>
+    <dimen name="all_apps_view_pageLayoutWidthGap">28dp</dimen>
+    <dimen name="all_apps_view_pageLayoutHeightGap">8dp</dimen>
     <dimen name="all_apps_view_pageLayoutPaddingTop">20dp</dimen>
     <dimen name="all_apps_view_pageLayoutPaddingBottom">14dp</dimen>
     <dimen name="all_apps_view_pageLayoutPaddingLeft">40dp</dimen>
diff --git a/res/values-large-port/dimens.xml b/res/values-large-port/dimens.xml
index 86bd03d24..ba60e73ba 100644
--- a/res/values-large-port/dimens.xml
+++ b/res/values-large-port/dimens.xml
@@ -15,6 +15,7 @@
 -->
 
 <resources>
+<!-- AppsCustomize -->
     <dimen name="apps_customize_cell_width">96dp</dimen>
     <dimen name="apps_customize_cell_height">96dp</dimen>
     <!-- The amount of space to account for the next/prev pages when
@@ -22,10 +23,18 @@
          In portrait/large we use apps_customize_cell_width / 8. -->
     <dimen name="apps_customize_peek_width">12dp</dimen>
 
+<!-- Workspace -->
     <!-- the area at the edge of the screen that makes the workspace go left
          or right while you're dragging. -->
     <dimen name="scroll_zone">40dp</dimen>
 
+    <dimen name="workspace_left_padding">15dip</dimen>
+    <dimen name="workspace_right_padding">15dip</dimen>
+    <dimen name="workspace_top_padding">25dip</dimen>
+    <dimen name="workspace_bottom_padding">25dip</dimen>
+    <dimen name="workspace_width_gap">0dp</dimen>
+    <dimen name="workspace_height_gap">32dp</dimen>
+
     <dimen name="all_apps_view_pageLayoutWidthGap">24dp</dimen>
     <dimen name="all_apps_view_pageLayoutHeightGap">36dp</dimen>
     <dimen name="all_apps_view_pageLayoutPaddingTop">25dp</dimen>
diff --git a/res/values-large/dimens.xml b/res/values-large/dimens.xml
index eb48859a6..9d4b3d9ea 100644
--- a/res/values-large/dimens.xml
+++ b/res/values-large/dimens.xml
@@ -18,6 +18,13 @@
 <!-- Workspace -->
     <dimen name="qsb_bar_height">56dp</dimen>
 
+    <dimen name="workspace_cell_width">96dip</dimen>
+    <dimen name="workspace_cell_height">96dip</dimen>
+
+    <dimen name="workspace_page_spacing_land">50dp</dimen>
+    <dimen name="workspace_page_spacing_port">64dp</dimen>
+
+<!-- AppsCustomize -->
     <dimen name="apps_customize_cell_width">96dp</dimen>
     <dimen name="apps_customize_cell_height">96dp</dimen>
     <!-- The amount of space to account for the next/prev pages when
@@ -27,27 +34,6 @@
     <dimen name="apps_customize_widget_cell_width_gap">36dp</dimen>
     <dimen name="apps_customize_widget_cell_height_gap">36dp</dimen>
 
-    <dimen name="workspace_cell_width">96dip</dimen>
-    <dimen name="workspace_cell_height">96dip</dimen>
-
-    <dimen name="workspace_x_axis_start_padding_land">25dip</dimen>
-    <dimen name="workspace_x_axis_end_padding_land">25dip</dimen>
-    <dimen name="workspace_y_axis_start_padding_land">15dip</dimen>
-    <dimen name="workspace_y_axis_end_padding_land">15dip</dimen>
-    <dimen name="workspace_x_axis_start_padding_port">15dip</dimen>
-    <dimen name="workspace_x_axis_end_padding_port">15dip</dimen>
-    <dimen name="workspace_y_axis_start_padding_port">25dip</dimen>
-    <dimen name="workspace_y_axis_end_padding_port">25dip</dimen>
-
-    <!-- Width/height gap overrides for the workspace -->
-    <dimen name="workspace_width_gap_land">32dp</dimen>
-    <dimen name="workspace_height_gap_land">2dp</dimen>
-    <dimen name="workspace_width_gap_port">0dp</dimen>
-    <dimen name="workspace_height_gap_port">32dp</dimen>
-
-    <dimen name="workspace_page_spacing_land">50dp</dimen>
-    <dimen name="workspace_page_spacing_port">64dp</dimen>
-
     <!-- The corner radius to draw the external drop icon rounded rect -->
     <dimen name="external_drop_icon_rect_radius">10dp</dimen>
     
diff --git a/res/values-large/styles.xml b/res/values-large/styles.xml
index f44bfa58a..386e9ca60 100644
--- a/res/values-large/styles.xml
+++ b/res/values-large/styles.xml
@@ -18,6 +18,42 @@
 -->
 
 <resources>
+<!-- Workspace -->
+    <style name="WorkspaceIcon.Portrait">
+        <item name="android:drawablePadding">4dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:paddingRight">4dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:textSize">13dip</item>
+    </style>
+    <style name="WorkspaceIcon.Portrait.Folder">
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:paddingRight">4dp</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:textSize">13dip</item>
+    </style>
+    <style name="WorkspaceIcon.Landscape">
+        <item name="android:drawablePadding">4dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:paddingRight">4dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingBottom">4dp</item>
+        <item name="android:textSize">13dip</item>
+    </style>
+    <style name="WorkspaceIcon.Landscape.Folder">
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:paddingRight">4dp</item>
+        <item name="android:paddingTop">0dp</item>
+        <item name="android:paddingBottom">0dp</item>
+        <item name="android:textSize">13dip</item>
+    </style>
+    <style name="WorkspaceIcon.AppsCustomize">
+        <item name="android:drawablePadding">2dp</item>
+        <item name="android:textSize">13dip</item>
+    </style>
+
     <style name="Theme" parent="android:Theme.Holo">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionModeOverlay">true</item>
@@ -31,18 +67,6 @@
         <item name="android:screenOrientation">unspecified</item>
     </style>
 
-    <style name="WorkspaceIcon.Portrait">
-        <item name="android:drawablePadding">2dip</item>
-        <item name="android:paddingTop">0dip</item>
-        <item name="android:includeFontPadding">false</item>
-    </style>
-
-    <style name="WorkspaceIcon.Landscape">
-        <item name="android:drawablePadding">2dip</item>
-        <item name="android:paddingTop">0dip</item>
-        <item name="android:includeFontPadding">false</item>
-    </style>
-
     <style name="TabIndicator.Wide">
         <item name="android:paddingLeft">40dp</item>
         <item name="android:paddingRight">40dp</item>
diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml
index 7d50c1a0c..58b81b8e1 100644
--- a/res/values-port/dimens.xml
+++ b/res/values-port/dimens.xml
@@ -15,15 +15,22 @@
 -->
 
 <resources>
-    <dimen name="workspace_cell_width">80dip</dimen>
-    <dimen name="workspace_cell_height">100dip</dimen>
+<!-- Workspace -->
+    <dimen name="workspace_left_padding">0dp</dimen>
+    <dimen name="workspace_right_padding">0dp</dimen>
+    <!-- NOTE: This padding is the @dimen/qsb_bar_height + some padding -->
+    <dimen name="workspace_top_padding">60dp</dimen>
+    <!-- NOTE: This padding is the @dimen/button_bar_height + some padding
+         for signposting -->
+    <dimen name="workspace_bottom_padding">64dp</dimen>
+
     <dimen name="folder_cell_width">74dip</dimen>
     <dimen name="folder_cell_height">86dip</dimen>
 
     <integer name="all_apps_view_cellCountX">4</integer>
     <integer name="all_apps_view_cellCountY">5</integer>
-    <dimen name="all_apps_view_pageLayoutWidthGap">3dp</dimen>
-    <dimen name="all_apps_view_pageLayoutHeightGap">12dp</dimen>
+    <dimen name="all_apps_view_pageLayoutWidthGap">0dp</dimen>
+    <dimen name="all_apps_view_pageLayoutHeightGap">8dp</dimen>
     <dimen name="all_apps_view_pageLayoutPaddingTop">15dp</dimen>
     <dimen name="all_apps_view_pageLayoutPaddingBottom">15dp</dimen>
     <dimen name="all_apps_view_pageLayoutPaddingLeft">0dp</dimen>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index ee48aa7a0..284f57472 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -45,20 +45,13 @@
         <attr name="cellWidth" format="dimension"  />
         <!-- The height of a single cell -->
         <attr name="cellHeight" format="dimension"  />
-        <!-- Padding to apply at the start of the long axis -->
-        <attr name="xAxisStartPadding" format="dimension"  />
-        <!-- Padding to apply at the end of the long axis -->
-        <attr name="xAxisEndPadding" format="dimension"  />
-        <!-- Padding to apply at the start of the short axis -->
-        <attr name="yAxisStartPadding" format="dimension"  />
-        <!-- Padding to apply at the end of the short axis -->
-        <attr name="yAxisEndPadding" format="dimension"  />
         <!-- An override for the width and height gap to allow users to specify
              a specific size for the page using spacing instead of resolving the
              spacing from the width of the page -->
         <attr name="widthGap" format="dimension" />
         <attr name="heightGap" format="dimension" />
-
+        <!-- The max gap size for each dimension -->
+        <attr name="maxGap" format="dimension" />
     </declare-styleable>
 
     <!-- StrokedTextView specific attributes. -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 763ed19ce..36e39949b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -17,6 +17,11 @@
 <resources>
 <!-- Workspace -->
     <dimen name="qsb_bar_height">56dp</dimen>
+    <dimen name="workspace_cell_width">80dp</dimen>
+    <dimen name="workspace_cell_height">80dp</dimen>
+    <dimen name="workspace_width_gap">-1dp</dimen>
+    <dimen name="workspace_height_gap">-1dp</dimen>
+    <dimen name="workspace_max_gap">8dp</dimen>
 
 <!-- QSB -->
     <dimen name="toolbar_button_vertical_padding">12dip</dimen>
@@ -24,9 +29,9 @@
 
 <!-- AllApps/Customize/AppsCustomize -->
     <!-- Size of icons in Workspace/AppsCustomize -->
-    <dimen name="app_icon_size">50dp</dimen>
-    <dimen name="apps_customize_cell_width">68dp</dimen>
-    <dimen name="apps_customize_cell_height">68dp</dimen>
+    <dimen name="app_icon_size">56dp</dimen>
+    <dimen name="apps_customize_cell_width">72dp</dimen>
+    <dimen name="apps_customize_cell_height">72dp</dimen>
     <!-- In portrat/normal, we peek only 1/8th the app cell width -->
     <dimen name="apps_customize_peek_width">9dp</dimen>
     <dimen name="apps_customize_widget_cell_width_gap">10dp</dimen>
@@ -79,11 +84,6 @@
     <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>
-
-<!-- Workspace grid -->
     <!-- Padding applied to AppWidgets -->
     <dimen name="app_widget_padding_left">0dp</dimen>
     <dimen name="app_widget_padding_right">0dp</dimen>
@@ -92,7 +92,7 @@
 
 <!-- Folders -->
     <!-- The size of the image which sits behind the preview of the folder contents -->
-    <dimen name="folder_preview_size">56dp</dimen>
+    <dimen name="folder_preview_size">64dp</dimen>
     <!-- The amount that the preview contents are inset from the preview background -->
     <dimen name="folder_preview_padding">4dp</dimen>
     <dimen name="folder_padding">18dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0449b9349..4e498a64c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -37,35 +37,45 @@
     <style name="WorkspaceIcon">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>
-        <item name="android:paddingLeft">5dip</item>
-        <item name="android:paddingRight">5dip</item>
+        <item name="android:layout_gravity">center</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">marquee</item>
-        <item name="android:textSize">13dip</item>
+        <item name="android:textSize">12dip</item>
         <item name="android:textColor">#FFF</item>
         <item name="android:shadowRadius">2.0</item>
         <item name="android:shadowColor">#B0000000</item>
     </style>
 
-    <style name="WorkspaceIcon.AllApps">
+    <style name="WorkspaceIcon.AppsCustomize">
         <item name="android:background">@null</item>
+        <item name="android:drawablePadding">0dp</item>
+        <item name="android:includeFontPadding">false</item>
     </style>
 
     <style name="WorkspaceIcon.Portrait">
-        <item name="android:drawablePadding">5dip</item>
-        <item name="android:paddingTop">0dip</item>
-        <item name="android:layout_marginLeft">3dip</item>
-        <item name="android:layout_marginRight">3dip</item>
-        <item name="android:layout_marginTop">13dip</item>
-        <item name="android:layout_marginBottom">8dip</item>
+        <item name="android:drawablePadding">4dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:paddingRight">4dp</item>
+        <item name="android:paddingTop">4dp</item>
+        <item name="android:paddingBottom">4dp</item>
     </style>
 
     <style name="WorkspaceIcon.Landscape">
-        <item name="android:drawablePadding">3dip</item>
-        <item name="android:paddingTop">2dip</item>
-        <item name="android:layout_marginLeft">10dip</item>
-        <item name="android:layout_marginRight">10dip</item>
+        <item name="android:drawablePadding">0dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:paddingRight">4dp</item>
+        <item name="android:paddingTop">2dp</item>
+        <item name="android:paddingBottom">4dp</item>
+    </style>
+    <style name="WorkspaceIcon.Portrait.Folder">
+        <item name="android:drawablePadding">0dp</item>
+        <item name="android:paddingTop">0dp</item>
+    </style>
+
+    <style name="WorkspaceIcon.Landscape.Folder">
+        <item name="android:drawablePadding">0dp</item>
+        <item name="android:paddingTop">0dp</item>
     </style>
 
     <style name="SearchDropTargetBar">
-- 
cgit v1.2.3