summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-10-12 01:14:11 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-10-12 01:14:11 +0000
commit543d29317a27784de97a5e7d4ea77fa94c1d4d86 (patch)
tree35e05e6c1665f0dce7abe0d97694480b847fde5f
parent07eea85dbb95726af08aa40369b3cb9ffae6f563 (diff)
parent9a1a064ca88e54e27c5fd0a751a3ceb4b5b79d01 (diff)
downloadandroid_packages_apps_Trebuchet-543d29317a27784de97a5e7d4ea77fa94c1d4d86.tar.gz
android_packages_apps_Trebuchet-543d29317a27784de97a5e7d4ea77fa94c1d4d86.tar.bz2
android_packages_apps_Trebuchet-543d29317a27784de97a5e7d4ea77fa94c1d4d86.zip
Merge "Revert "Trebuchet : Fix cellsize for dynamic changes"" into cm-10.2
-rw-r--r--src/com/cyanogenmod/trebuchet/CellLayout.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/trebuchet/CellLayout.java b/src/com/cyanogenmod/trebuchet/CellLayout.java
index 6da8875ed..eab7d1e02 100644
--- a/src/com/cyanogenmod/trebuchet/CellLayout.java
+++ b/src/com/cyanogenmod/trebuchet/CellLayout.java
@@ -283,6 +283,11 @@ public class CellLayout extends ViewGroup {
mShortcutsAndWidgets = new ShortcutAndWidgetContainer(context);
+ if (!LauncherApplication.isScreenLarge()){
+ 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);
addView(mShortcutsAndWidgets);
}