From e61c6a35b26d3602f91b0069b6dd4407ae995951 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Thu, 19 May 2011 16:48:48 -0700
Subject: Dynamically determine # of rows/cols in All Apps.

DO NOT MERGE

Change-Id: I3c050abcd8c00235094708d59eda81f923df6806
---
 res/layout-large/all_apps_tabbed.xml | 2 --
 res/values-large-land/dimens.xml     | 2 --
 res/values-large-port/dimens.xml     | 2 --
 res/values-large/config.xml          | 3 +++
 4 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'res')

diff --git a/res/layout-large/all_apps_tabbed.xml b/res/layout-large/all_apps_tabbed.xml
index 993733821..9064101fc 100644
--- a/res/layout-large/all_apps_tabbed.xml
+++ b/res/layout-large/all_apps_tabbed.xml
@@ -94,8 +94,6 @@
                 android:id="@+id/all_apps_paged_view"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                launcher:cellCountX="@integer/all_apps_view_cellCountX"
-                launcher:cellCountY="@integer/all_apps_view_cellCountY"
                 launcher:pageLayoutWidthGap="@dimen/all_apps_view_pageLayoutWidthGap"
                 launcher:pageLayoutHeightGap="@dimen/all_apps_view_pageLayoutHeightGap"
                 launcher:pageLayoutPaddingTop="@dimen/all_apps_view_pageLayoutPaddingTop"
diff --git a/res/values-large-land/dimens.xml b/res/values-large-land/dimens.xml
index 196cdb0a4..0f7e0eddf 100644
--- a/res/values-large-land/dimens.xml
+++ b/res/values-large-land/dimens.xml
@@ -22,8 +22,6 @@
     <dimen name="customization_drawer_height">480dp</dimen>
     <dimen name="customization_drawer_content_height">420dp</dimen>
 
-    <integer name="all_apps_view_cellCountX">7</integer>
-    <integer name="all_apps_view_cellCountY">5</integer>
     <dimen name="all_apps_view_pageLayoutWidthGap">36dp</dimen>
     <dimen name="all_apps_view_pageLayoutHeightGap">6dp</dimen>
     <dimen name="all_apps_view_pageLayoutPaddingTop">20dp</dimen>
diff --git a/res/values-large-port/dimens.xml b/res/values-large-port/dimens.xml
index 47cac78e8..2ea9e3875 100644
--- a/res/values-large-port/dimens.xml
+++ b/res/values-large-port/dimens.xml
@@ -22,8 +22,6 @@
     <dimen name="customization_drawer_height">800dp</dimen>
     <dimen name="customization_drawer_content_height">420dp</dimen>
 
-    <integer name="all_apps_view_cellCountX">5</integer>
-    <integer name="all_apps_view_cellCountY">7</integer>
     <dimen name="all_apps_view_pageLayoutWidthGap">36dp</dimen>
     <dimen name="all_apps_view_pageLayoutHeightGap">36dp</dimen>
     <dimen name="all_apps_view_pageLayoutPaddingTop">25dp</dimen>
diff --git a/res/values-large/config.xml b/res/values-large/config.xml
index 56c7bc688..4b0c8206f 100644
--- a/res/values-large/config.xml
+++ b/res/values-large/config.xml
@@ -58,6 +58,9 @@
     <integer name="config_dragViewOffsetX">0</integer>
     <integer name="config_dragViewOffsetY">-12</integer>
 
+    <!-- When shrinking the workspace, this is the percentage of its original size. -->
+    <integer name="config_workspaceShrinkPercent">17</integer>
+
     <!-- When items are dropped on the mini screens in customize mode, we have a bounce animation
          of the bright green hover outline, and then fade out the outline at the end. These are
          the values used in that animation -->
-- 
cgit v1.2.3