summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/layout-sw720dp/hotseat.xml3
-rw-r--r--src/com/cyanogenmod/trebuchet/Hotseat.java5
2 files changed, 2 insertions, 6 deletions
diff --git a/res/layout-sw720dp/hotseat.xml b/res/layout-sw720dp/hotseat.xml
index 3abd133..dfe0c50 100644
--- a/res/layout-sw720dp/hotseat.xml
+++ b/res/layout-sw720dp/hotseat.xml
@@ -16,5 +16,4 @@
<com.cyanogenmod.trebuchet.Hotseat
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"
- launcher:cellCountX="@integer/hotseat_cell_count"
- launcher:cellCountY="1" />
+ launcher:cellCount="@integer/hotseat_cell_count" />
diff --git a/src/com/cyanogenmod/trebuchet/Hotseat.java b/src/com/cyanogenmod/trebuchet/Hotseat.java
index 77ec2cc..08ca1ed 100644
--- a/src/com/cyanogenmod/trebuchet/Hotseat.java
+++ b/src/com/cyanogenmod/trebuchet/Hotseat.java
@@ -67,10 +67,7 @@ public class Hotseat extends PagedView {
mIsLandscape = context.getResources().getConfiguration().orientation ==
Configuration.ORIENTATION_LANDSCAPE;
mCellCount = a.getInt(R.styleable.Hotseat_cellCount, DEFAULT_CELL_COUNT);
- int cellCount = PreferencesProvider.Interface.Dock.getNumberIcons(0);
- if (cellCount > 0) {
- mCellCount = cellCount;
- }
+ mCellCount = PreferencesProvider.Interface.Dock.getNumberIcons(mCellCount);
mVertical = hasVerticalHotseat();