diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-08-14 17:47:11 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-08-14 17:50:47 +0100 |
| commit | 4f5437c254fa0f2f69ee5c5fea56a8b1e579bc64 (patch) | |
| tree | 1fd92fdf5a790e9965c517ec2f5d44fa5b795934 /res | |
| parent | 59b5eac613b8083fb25f71f39e8834d0078eff95 (diff) | |
| download | android_packages_apps_Trebuchet-4f5437c254fa0f2f69ee5c5fea56a8b1e579bc64.tar.gz android_packages_apps_Trebuchet-4f5437c254fa0f2f69ee5c5fea56a8b1e579bc64.tar.bz2 android_packages_apps_Trebuchet-4f5437c254fa0f2f69ee5c5fea56a8b1e579bc64.zip | |
Trebuchet: Revert per-device grid size customization
This can be now configured using the JB-provided cell_count_x
and cell_count_y configuration parameters
Revert "trebuchet: Don't hardcode the cellcounts in XML"
This reverts commit 59b5eac613b8083fb25f71f39e8834d0078eff95.
Revert "trebuchet: Fix setting of default workspace size"
This reverts commit db7eef73d259158bc95ba1b2b79a73b298c6a709.
Revert "trebuchet: Add config for workspace grid size"
This reverts commit 4c09961357a4472088ac1660ad2a3a518fbda7d8.
Change-Id: Iccc4465db8a6ecd51b1d0f02d54c3a29e9b766ca
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/launcher.xml | 2 | ||||
| -rw-r--r-- | res/layout-port/launcher.xml | 2 | ||||
| -rw-r--r-- | res/values/config.xml | 4 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 8bbf6451e..1a1f908b1 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -32,6 +32,8 @@ android:paddingRight="@dimen/workspace_right_padding" android:paddingTop="@dimen/workspace_top_padding" android:paddingBottom="@dimen/workspace_bottom_padding" + launcher:cellCountX="@integer/cell_count_x" + launcher:cellCountY="@integer/cell_count_y" launcher:pageSpacing="@dimen/workspace_page_spacing" launcher:scrollIndicatorPaddingLeft="@dimen/qsb_bar_height" launcher:scrollIndicatorPaddingRight="@dimen/button_bar_height" /> diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 901565f17..b4ec30c3a 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -49,6 +49,8 @@ android:paddingRight="@dimen/workspace_right_padding" android:paddingTop="@dimen/workspace_top_padding" android:paddingBottom="@dimen/workspace_bottom_padding" + launcher:cellCountX="@integer/cell_count_x" + launcher:cellCountY="@integer/cell_count_y" launcher:pageSpacing="@dimen/workspace_page_spacing" launcher:scrollIndicatorPaddingLeft="@dimen/workspace_divider_padding_left" launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right" /> diff --git a/res/values/config.xml b/res/values/config.xml index cc7e9f58d..724d89f87 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -82,8 +82,4 @@ <integer name="cell_count_y">4</integer> <integer name="hotseat_cell_count">5</integer> <integer name="hotseat_all_apps_index">2</integer> - - <!-- Workspace grid size --> - <integer name="config_workspaceRows">4</integer> - <integer name="config_workspaceColumns">4</integer> </resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index eca5e71ff..bc3c58c92 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -27,8 +27,8 @@ android:summary="@string/preferences_interface_homescreen_general_grid_summary" launcher:pickerTitle1="@string/preferences_interface_homescreen_general_grid_rows_title" launcher:pickerTitle2="@string/preferences_interface_homescreen_general_grid_columns_title" - launcher:defaultValue1="@integer/config_workspaceRows" - launcher:defaultValue2="@integer/config_workspaceColumns" + launcher:defaultValue1="@integer/cell_count_y" + launcher:defaultValue2="@integer/cell_count_x" launcher:max1="7" launcher:min1="3" launcher:max2="7" |