diff options
| -rw-r--r-- | res/values/config.xml | 7 | ||||
| -rw-r--r-- | res/xml/preferences_homescreen.xml | 4 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Workspace.java | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 570582534..f32e6b883 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -77,6 +77,13 @@ <integer name="folder_max_count_y">4</integer> <integer name="folder_max_num_items">16</integer> + <!-- Workspace grid size --> + <integer name="config_maxWorkspaceRows">7</integer> + <integer name="config_maxWorkspaceColumns">7</integer> + + <!-- Allow tablets to set grid size in settings, false disables --> + <bool name="config_workspaceTabletGrid">false</bool> + <!-- Actual cell count --> <integer name="target_cell_count_x">@integer/default_cell_count_x</integer> <integer name="target_cell_count_y">@integer/default_cell_count_y</integer> diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml index 862ab20c5..02d2d4318 100644 --- a/res/xml/preferences_homescreen.xml +++ b/res/xml/preferences_homescreen.xml @@ -26,9 +26,9 @@ launcher:pickerTitle2="@string/preferences_interface_homescreen_general_grid_columns_title" launcher:defaultValue1="@integer/target_cell_count_x" launcher:defaultValue2="@integer/target_cell_count_y" - launcher:max1="7" + launcher:max1="@integer/config_maxWorkspaceRows" launcher:min1="3" - launcher:max2="7" + launcher:max2="@integer/config_maxWorkspaceColumns" launcher:min2="3" /> <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_homescreen_screens" android:title="@string/preferences_interface_homescreen_general_screens_title" diff --git a/src/com/cyanogenmod/trebuchet/Workspace.java b/src/com/cyanogenmod/trebuchet/Workspace.java index cd3dfd3dd..565d25aec 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); } |