summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDavid Marble <drmarble1@gmail.com>2012-08-11 18:22:31 -0500
committerDavid Marble <drmarble1@gmail.com>2012-08-19 16:54:29 -0500
commit84cfbfa316897a1cd25cd34e272c355f8546d52b (patch)
treefdcafcdd9b09178f6a1a733b93f4b68e64d1912f /res
parentafd9dd1756877a2bf7a29c3de5d88c07113c2a5b (diff)
downloadandroid_packages_apps_Trebuchet-84cfbfa316897a1cd25cd34e272c355f8546d52b.tar.gz
android_packages_apps_Trebuchet-84cfbfa316897a1cd25cd34e272c355f8546d52b.tar.bz2
android_packages_apps_Trebuchet-84cfbfa316897a1cd25cd34e272c355f8546d52b.zip
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
Diffstat (limited to 'res')
-rw-r--r--res/values/config.xml7
-rw-r--r--res/xml/preferences.xml4
2 files changed, 9 insertions, 2 deletions
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"