diff options
author | Danesh M <daneshm90@gmail.com> | 2014-02-04 21:31:31 -0800 |
---|---|---|
committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-02-06 12:59:42 -0800 |
commit | 74a9e55def7de5939d9d6210f06d3f753a01033e (patch) | |
tree | e9470fefd91585287bc06a0179500a95b1c9bbd5 /src/com/android/launcher3 | |
parent | a3b023c89cdac39d2d7b68e5a5652175114b6348 (diff) | |
download | android_packages_apps_Trebuchet-74a9e55def7de5939d9d6210f06d3f753a01033e.tar.gz android_packages_apps_Trebuchet-74a9e55def7de5939d9d6210f06d3f753a01033e.tar.bz2 android_packages_apps_Trebuchet-74a9e55def7de5939d9d6210f06d3f753a01033e.zip |
Trebuchet : default workspace
Change default screen to screen 0 (far left screen) to match
Launcher3. Clean up default layouts for various device types.
Also fix missing layouts for allAppsCling.
Update: Replace Books with Hangouts
Update: Clean and add non-GMS fallbacks
Update: Fix MMS being in sw70-non-telephony
Update: Cast checkitemplacement to long
Update: Layouts and avoid rounding issues for sw600dp
Change-Id: If0c3ad5ffcb8e2ee4b811251c0360f7512c31fdb
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/DynamicGrid.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index 3329901c6..9be3134c1 100644 --- a/src/com/android/launcher3/DynamicGrid.java +++ b/src/com/android/launcher3/DynamicGrid.java @@ -178,7 +178,7 @@ class DeviceProfile { // Hotseat hotseatIconSize = invDistWeightedInterpolate(minWidth, minHeight, points); hotseatIconSizePx = DynamicGrid.pxFromDp(hotseatIconSize, dm); - hotseatAllAppsRank = (int) (numColumns / 2); + hotseatAllAppsRank = (int) Math.ceil(numColumns / 2); // Calculate other vars based on Configuration updateFromConfiguration(resources, wPx, hPx, awPx, ahPx); @@ -543,7 +543,7 @@ public class DynamicGrid { // The tablet profile is odd in that the landscape orientation // also includes the nav bar on the side deviceProfiles.add(new DeviceProfile("Nexus 7", - 575, 904, 6, 6, (useLargeIcons ? 72 : 60), 14.4f, 7, (useLargeIcons ? 60 : 52))); + 575, 904, 5, 5, (useLargeIcons ? 72 : 60), 14.4f, 7, (useLargeIcons ? 60 : 52))); // Larger tablet profiles always have system bars on the top & bottom deviceProfiles.add(new DeviceProfile("Nexus 10", 727, 1207, 5, 8, (useLargeIcons ? 80 : 64), 14.4f, 9, (useLargeIcons ? 64 : 56))); diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index ee808df63..c6ef2b7bf 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1321,7 +1321,7 @@ public class LauncherModel extends BroadcastReceiver { + item.cellY + ") occupied by " + occupied.get((long) LauncherSettings.Favorites.CONTAINER_HOTSEAT) [(int) item.screenId][0]); - if (occupied.get(LauncherSettings.Favorites.CONTAINER_HOTSEAT) + if (occupied.get((long) LauncherSettings.Favorites.CONTAINER_HOTSEAT) [(int) item.screenId][0].itemType == LauncherSettings.Favorites.ITEM_TYPE_ALLAPPS) { deleteOnItemOverlap.set(true); } |