summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornebkat <nebkat@teamhacksung.org>2013-01-06 07:17:33 -0800
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2013-01-06 07:17:33 -0800
commit57fc0ef802847dc323fc05b8e1f42f48b72d9a73 (patch)
tree5dcb39c050c01273576c5b406652942d32225dc3
parenta55da3588289f25d9b2a29076f14298a9601d3a5 (diff)
parentc1e82f60c502379e3e8a116cd36d6d5c99c03f1d (diff)
downloadandroid_packages_apps_Trebuchet-57fc0ef802847dc323fc05b8e1f42f48b72d9a73.tar.gz
android_packages_apps_Trebuchet-57fc0ef802847dc323fc05b8e1f42f48b72d9a73.tar.bz2
android_packages_apps_Trebuchet-57fc0ef802847dc323fc05b8e1f42f48b72d9a73.zip
Merge "CellLayout: Use default and target cell counts" into cm-10.1
-rw-r--r--res/layout-land/launcher.xml4
-rw-r--r--res/layout-port/launcher.xml4
-rw-r--r--res/layout-sw720dp/launcher.xml4
-rw-r--r--res/values-sw600dp/config.xml4
-rw-r--r--res/values-sw720dp/config.xml4
-rw-r--r--res/values/config.xml8
-rw-r--r--res/xml/preferences_homescreen.xml4
-rw-r--r--src/com/cyanogenmod/trebuchet/CellLayout.java4
8 files changed, 20 insertions, 16 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index d84ffaa85..f6ac21d59 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -31,8 +31,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:cellCountX="@integer/target_cell_count_x"
+ launcher:cellCountY="@integer/target_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 cbf53053e..f05aac7b8 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -31,8 +31,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:cellCountX="@integer/target_cell_count_x"
+ launcher:cellCountY="@integer/target_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/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 7fb693e73..be3404589 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -32,8 +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:cellCountX="@integer/target_cell_count_x"
+ launcher:cellCountY="@integer/target_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-sw600dp/config.xml b/res/values-sw600dp/config.xml
index ff3da4160..763fec2cf 100644
--- a/res/values-sw600dp/config.xml
+++ b/res/values-sw600dp/config.xml
@@ -1,6 +1,6 @@
<resources>
- <integer name="cell_count_x">6</integer>
- <integer name="cell_count_y">6</integer>
+ <integer name="default_cell_count_x">6</integer>
+ <integer name="default_cell_count_y">6</integer>
<integer name="hotseat_cell_count">7</integer>
<integer name="hotseat_all_apps_index">3</integer>
<bool name="allow_rotation">true</bool>
diff --git a/res/values-sw720dp/config.xml b/res/values-sw720dp/config.xml
index a0954a0e4..89c21fad0 100644
--- a/res/values-sw720dp/config.xml
+++ b/res/values-sw720dp/config.xml
@@ -1,6 +1,6 @@
<resources>
- <integer name="cell_count_x">8</integer>
- <integer name="cell_count_y">5</integer>
+ <integer name="default_cell_count_x">8</integer>
+ <integer name="default_cell_count_y">5</integer>
<integer name="hotseat_cell_count">9</integer>
<integer name="hotseat_all_apps_index">4</integer>
<bool name="config_largeHeap">true</bool>
diff --git a/res/values/config.xml b/res/values/config.xml
index e8fd70584..4257e451d 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -77,8 +77,12 @@
<integer name="folder_max_count_y">4</integer>
<integer name="folder_max_num_items">16</integer>
- <integer name="cell_count_x">4</integer>
- <integer name="cell_count_y">4</integer>
+ <!-- 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>
+ <!-- Default cell count that scales properly (will be used as a reference for scaling when different counts are used) -->
+ <integer name="default_cell_count_x">4</integer>
+ <integer name="default_cell_count_y">4</integer>
<!-- Whether or not to use custom clings if a custom workspace layout is passed in -->
<bool name="config_useCustomClings">false</bool>
diff --git a/res/xml/preferences_homescreen.xml b/res/xml/preferences_homescreen.xml
index 785a564e7..2df79cf22 100644
--- a/res/xml/preferences_homescreen.xml
+++ b/res/xml/preferences_homescreen.xml
@@ -24,8 +24,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/cell_count_x"
- launcher:defaultValue2="@integer/cell_count_y"
+ launcher:defaultValue1="@integer/target_cell_count_x"
+ launcher:defaultValue2="@integer/target_cell_count_y"
launcher:max1="7"
launcher:min1="3"
launcher:max2="7"
diff --git a/src/com/cyanogenmod/trebuchet/CellLayout.java b/src/com/cyanogenmod/trebuchet/CellLayout.java
index 6e128319f..1fd5a5fa8 100644
--- a/src/com/cyanogenmod/trebuchet/CellLayout.java
+++ b/src/com/cyanogenmod/trebuchet/CellLayout.java
@@ -281,8 +281,8 @@ public class CellLayout extends ViewGroup {
mShortcutsAndWidgets = new ShortcutAndWidgetContainer(context);
if (!LauncherApplication.isScreenLarge()){
- mCellWidth = (mCellWidth * 4) / mCountX;
- mCellHeight = (mCellHeight * 4) / mCountY;
+ mCellWidth = (mCellWidth * res.getInteger(R.integer.default_cell_count_x)) / mCountX;
+ mCellHeight = (mCellHeight * res.getInteger(R.integer.default_cell_count_y)) / mCountY;
}
mShortcutsAndWidgets.setCellDimensions(mCellWidth, mCellHeight, mWidthGap, mHeightGap);