summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/CellLayout.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-08-03 12:03:40 -0700
committerWinson Chung <winsonc@google.com>2011-08-03 14:29:19 -0700
commit54c725cc294cd43ed0650179bfae64a622547660 (patch)
treed90016ff4cdbfaba7ab16d77b1039ae364d7e3db /src/com/android/launcher2/CellLayout.java
parentaaf473c2bb6329b3b09ed2e19de6aae26077050c (diff)
downloadandroid_packages_apps_Trebuchet-54c725cc294cd43ed0650179bfae64a622547660.tar.gz
android_packages_apps_Trebuchet-54c725cc294cd43ed0650179bfae64a622547660.tar.bz2
android_packages_apps_Trebuchet-54c725cc294cd43ed0650179bfae64a622547660.zip
Bug fixes
- Fixing issue where drop target is not as tall as it should be (5116098) - Fixing issue where number of cells was being computed incorrectly (5112002) - Disabling side page fading in AppsCustomize on the phone UI - Should be using action bar bg states instead of tab bg states (5086625) Change-Id: I0ec927f87cede48dcf4b66cbaa1d62a09f3492b8
Diffstat (limited to 'src/com/android/launcher2/CellLayout.java')
-rw-r--r--src/com/android/launcher2/CellLayout.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 0a3c96dc4..d9d048788 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -1528,8 +1528,8 @@ public class CellLayout extends ViewGroup {
int smallerSize = Math.min(actualWidth, actualHeight);
// Always round up to next largest cell
- int spanX = (width + smallerSize) / smallerSize;
- int spanY = (height + smallerSize) / smallerSize;
+ int spanX = (int) Math.ceil(width / (float) smallerSize);
+ int spanY = (int) Math.ceil(height / (float) smallerSize);
if (result == null) {
return new int[] { spanX, spanY };