Merge remote branch 'cm/cm-10.1' into cm-10.1

CyanogenMod · Jan 6, 2013 · b5a0462 · b5a0462
2 parents 0f75f0f + 57fc0ef
commit b5a0462
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -281,8 +281,8 @@ public void onAnimationEnd(Animator animation) {
         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);