diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-08-23 12:46:27 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-08-23 12:46:27 +0400 |
| commit | 2c46192e2f15e4385015ec6b2bfac58489d871a7 (patch) | |
| tree | 96a96aff9275a536b64b0c4e53798051cf999681 /res | |
| parent | 4ac9eaec0124f870115dfe24557cde2c1b65112a (diff) | |
| parent | 84cfbfa316897a1cd25cd34e272c355f8546d52b (diff) | |
| download | android_packages_apps_Trebuchet-2c46192e2f15e4385015ec6b2bfac58489d871a7.tar.gz android_packages_apps_Trebuchet-2c46192e2f15e4385015ec6b2bfac58489d871a7.tar.bz2 android_packages_apps_Trebuchet-2c46192e2f15e4385015ec6b2bfac58489d871a7.zip | |
Merge "Trebuchet: Add overlayable config for tablet workspace grid size" into jellybean
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/config.xml | 7 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 724d89f87..5bbaec347 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -78,6 +78,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> + <integer name="cell_count_x">4</integer> <integer name="cell_count_y">4</integer> <integer name="hotseat_cell_count">5</integer> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 2aa383a83..5ec6a95f2 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -29,9 +29,9 @@ launcher:pickerTitle2="@string/preferences_interface_homescreen_general_grid_columns_title" launcher:defaultValue1="@integer/cell_count_y" launcher:defaultValue2="@integer/cell_count_x" - 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" |