summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Marble <drmarble1@gmail.com>2012-12-20 22:05:09 -0600
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-03-24 15:55:46 -0700
commita9125c94072ed2e668ae2668755bf11741d319e7 (patch)
tree4a0ad13e506973fad30fe89390dcecfb350b44cf /src
parent576c2169e8bbd8404268564475b4e070c739862e (diff)
downloadpackages_apps_trebuchet-a9125c94072ed2e668ae2668755bf11741d319e7.zip
packages_apps_trebuchet-a9125c94072ed2e668ae2668755bf11741d319e7.tar.gz
packages_apps_trebuchet-a9125c94072ed2e668ae2668755bf11741d319e7.tar.bz2
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. This is a port of: http://review.cyanogenmod.org/#/c/21067/ which was merged into jellybean. The default behavior is unchanged. Rebased. Change-Id: I3d7cf5e121a423a0033310eee88e498bc080af3c
Diffstat (limited to 'src')
-rw-r--r--src/com/cyanogenmod/trebuchet/Workspace.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index cd3dfd3..565d25a 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -371,7 +371,7 @@ public class Workspace extends PagedView
setOnHierarchyChangeListener(this);
// if there is a value set it the preferences, use that instead
- if (!LauncherApplication.isScreenLarge()) {
+ if ((!LauncherApplication.isScreenLarge()) || (getResources().getBoolean(R.bool.config_workspaceTabletGrid) == true)) {
cellCountX = PreferencesProvider.Interface.Homescreen.getCellCountX(cellCountX);
cellCountY = PreferencesProvider.Interface.Homescreen.getCellCountY(cellCountY);
}