diff options
author | Steve Kondik <shade@chemlab.org> | 2012-05-28 16:02:01 +0400 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-05-28 16:02:01 +0400 |
commit | b3961d1b51f2a48cd0e5629346abe7203a924350 (patch) | |
tree | 68cbaaf8a5a3e88efce4b9dae183738acb1b65e8 | |
parent | 4470180f89a68b23e877b231c086103864976867 (diff) | |
parent | 86e18033ea77533350dbe4ce31c04ee2d45b1568 (diff) | |
download | android_packages_apps_Trebuchet-b3961d1b51f2a48cd0e5629346abe7203a924350.tar.gz android_packages_apps_Trebuchet-b3961d1b51f2a48cd0e5629346abe7203a924350.tar.bz2 android_packages_apps_Trebuchet-b3961d1b51f2a48cd0e5629346abe7203a924350.zip |
Merge "trebuchet: Fix setting of default workspace size" into ics
-rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index 16d92c380..5a03a2fcd 100644 --- a/src/com/cyanogenmod/trebuchet/Workspace.java +++ b/src/com/cyanogenmod/trebuchet/Workspace.java @@ -153,9 +153,6 @@ public class Workspace extends PagedView 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) @@ -298,8 +295,8 @@ public class Workspace extends PagedView 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); |