summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2012-05-22 10:58:37 -0700
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2012-08-14 11:23:05 +0100
commitdb7eef73d259158bc95ba1b2b79a73b298c6a709 (patch)
tree4033b1de2e5d4b0a316766615c4fbbb0fa6da1ce /src
parent4c09961357a4472088ac1660ad2a3a518fbda7d8 (diff)
downloadandroid_packages_apps_Trebuchet-db7eef73d259158bc95ba1b2b79a73b298c6a709.tar.gz
android_packages_apps_Trebuchet-db7eef73d259158bc95ba1b2b79a73b298c6a709.tar.bz2
android_packages_apps_Trebuchet-db7eef73d259158bc95ba1b2b79a73b298c6a709.zip
trebuchet: Fix setting of default workspace size
Change-Id: I9b1dcdce8c22c479c6eceb492b9d307c54433711
Diffstat (limited to 'src')
-rw-r--r--src/com/cyanogenmod/trebuchet/Workspace.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java
index 5fc3b7a57..8bac5986d 100644
--- a/src/com/cyanogenmod/trebuchet/Workspace.java
+++ b/src/com/cyanogenmod/trebuchet/Workspace.java
@@ -155,9 +155,6 @@ public class Workspace extends SmoothPagedView
private SpringLoadedDragController mSpringLoadedDragController;
private float mSpringLoadedShrinkFactor;
- private static final int DEFAULT_CELL_COUNT_X = 4;
- private static final int DEFAULT_CELL_COUNT_Y = 4;
-
// State variable that indicates whether the pages are small (ie when you're
// in all apps or customize mode)
@@ -301,8 +298,8 @@ public class Workspace extends SmoothPagedView
mFadeInAdjacentScreens = false;
mWallpaperManager = WallpaperManager.getInstance(context);
- int cellCountX = DEFAULT_CELL_COUNT_X;
- int cellCountY = DEFAULT_CELL_COUNT_Y;
+ int cellCountX = context.getResources().getInteger(R.integer.config_workspaceColumns);
+ int cellCountY = context.getResources().getInteger(R.integer.config_workspaceRows);
TypedArray a = context.obtainStyledAttributes(attrs,
R.styleable.Workspace, defStyle, 0);