summaryrefslogtreecommitdiffstats
path: root/src/com/cyanogenmod/trebuchet/CellLayout.java
diff options
context:
space:
mode:
authornebkat <nebkat@teamhacksung.org>2012-12-30 23:12:34 +0000
committernebkat <nebkat@teamhacksung.org>2012-12-30 23:14:27 +0000
commit8ef4dd94aa73ef5a1fc7cac0945a38a6680fa550 (patch)
tree92014e3fd024af6c7091bd077b3bcfca8628437d /src/com/cyanogenmod/trebuchet/CellLayout.java
parent8dd822a77c94a57b670faca72227e46338d3feee (diff)
downloadandroid_packages_apps_Trebuchet-8ef4dd94aa73ef5a1fc7cac0945a38a6680fa550.tar.gz
android_packages_apps_Trebuchet-8ef4dd94aa73ef5a1fc7cac0945a38a6680fa550.tar.bz2
android_packages_apps_Trebuchet-8ef4dd94aa73ef5a1fc7cac0945a38a6680fa550.zip
LauncherModel: Fixes
Change-Id: Ibc2cd7e30309380ac95467467df8d831ca12a183
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/CellLayout.java')
-rw-r--r--src/com/cyanogenmod/trebuchet/CellLayout.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/trebuchet/CellLayout.java b/src/com/cyanogenmod/trebuchet/CellLayout.java
index 4029ed119..6e128319f 100644
--- a/src/com/cyanogenmod/trebuchet/CellLayout.java
+++ b/src/com/cyanogenmod/trebuchet/CellLayout.java
@@ -189,8 +189,8 @@ public class CellLayout extends ViewGroup {
mWidthGap = mOriginalWidthGap = a.getDimensionPixelSize(R.styleable.CellLayout_widthGap, 0);
mHeightGap = mOriginalHeightGap = a.getDimensionPixelSize(R.styleable.CellLayout_heightGap, 0);
mMaxGap = a.getDimensionPixelSize(R.styleable.CellLayout_maxGap, 0);
- mCountX = LauncherModel.getCellCountX();
- mCountY = LauncherModel.getCellCountY();
+ mCountX = LauncherModel.getWorkspaceCellCountX();
+ mCountY = LauncherModel.getWorkspaceCellCountY();
mOccupied = new boolean[mCountX][mCountY];
mTmpOccupied = new boolean[mCountX][mCountY];
mPreviousReorderDirection[0] = INVALID_DIRECTION;
@@ -614,7 +614,6 @@ public class CellLayout extends ViewGroup {
boolean markCells) {
final LayoutParams lp = params;
- // Hotseat icons - remove text
if (child instanceof BubbleTextView) {
BubbleTextView bubbleChild = (BubbleTextView) child;