From 84cfbfa316897a1cd25cd34e272c355f8546d52b Mon Sep 17 00:00:00 2001
From: David Marble <drmarble1@gmail.com>
Date: Sat, 11 Aug 2012 18:22:31 -0500
Subject: Trebuchet: Add overlayable config for tablet workspace grid size

Tablets with a 4x3 screen such as the HP Touchpad do not
work well with automatic grid size setting. This problem is described in
CyanogenMod Issue 5798: Trebuchet Tablet. This fixes that issue.

This creates a flag in config that can be overlayed at
build time to allow user settings to adjust grid size.

The maximum settable row and column counts are also overlayable.

The default behavior is unchanged.

Change-Id: I0577f54aad4e247277483378b413052ea488fd48
---
 res/values/config.xml   | 7 +++++++
 res/xml/preferences.xml | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/values/config.xml b/res/values/config.xml
index 724d89f87..5bbaec347 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -78,6 +78,13 @@
     <integer name="folder_max_count_y">4</integer>
     <integer name="folder_max_num_items">16</integer>
 
+    <!-- Workspace grid size -->
+    <integer name="config_maxWorkspaceRows">7</integer>
+    <integer name="config_maxWorkspaceColumns">7</integer>
+
+    <!-- Allow tablets to set grid size in settings, false disables -->
+    <bool name="config_workspaceTabletGrid">false</bool>
+
     <integer name="cell_count_x">4</integer>
     <integer name="cell_count_y">4</integer>
     <integer name="hotseat_cell_count">5</integer>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 2aa383a83..5ec6a95f2 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -29,9 +29,9 @@
                     launcher:pickerTitle2="@string/preferences_interface_homescreen_general_grid_columns_title"
                     launcher:defaultValue1="@integer/cell_count_y"
                     launcher:defaultValue2="@integer/cell_count_x"
-                    launcher:max1="7"
+                    launcher:max1="@integer/config_maxWorkspaceRows"
                     launcher:min1="3"
-                    launcher:max2="7"
+                    launcher:max2="@integer/config_maxWorkspaceColumns"
                     launcher:min2="3" />
                 <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_homescreen_screens"
                     android:title="@string/preferences_interface_homescreen_general_screens_title"
-- 
cgit v1.2.3