diff options
author | Paul Bouman <boumanpaul@gmail.com> | 2014-07-11 10:54:06 +0200 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-07-17 03:10:53 +0000 |
commit | 975c54a4630563e1d8e6ad1af0fee08d2013b17f (patch) | |
tree | 5af363ff162e473916d4969d85db02d244142d47 /src/com/android/launcher3 | |
parent | 4a65b0c3022357d2b14db196224931cc35f14417 (diff) | |
download | android_packages_apps_Trebuchet-975c54a4630563e1d8e6ad1af0fee08d2013b17f.tar.gz android_packages_apps_Trebuchet-975c54a4630563e1d8e6ad1af0fee08d2013b17f.tar.bz2 android_packages_apps_Trebuchet-975c54a4630563e1d8e6ad1af0fee08d2013b17f.zip |
Trebuchet: Fix scaling for some devices
Commit 'Adding specific buckets for N5 in dynamic grid' was not merged
correctly. The Nexus S profile was removed and Large Phone duplicated.
Change-Id: Ifc439e8d4a4840efe0da543cf30fbeb134972bb3
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/DynamicGrid.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index 9be377e8e..d426ce982 100644 --- a/src/com/android/launcher3/DynamicGrid.java +++ b/src/com/android/launcher3/DynamicGrid.java @@ -70,12 +70,12 @@ public class DynamicGrid { 275, 420, 3, 4, (useLargeIcons ? 54 : 48), 13, (hasAA ? 5 : 5), (useLargeIcons ? 54 : 48))); deviceProfiles.add(new DeviceProfile("Stubby", 255, 450, 3, 4, (useLargeIcons ? 54 : 48), 13, (hasAA ? 5 : 5), (useLargeIcons ? 54 : 48))); + deviceProfiles.add(new DeviceProfile("Nexus S", + 296, 491.33f, 4, 4, (useLargeIcons ? 56 : 48), 13, (hasAA ? 5 : 5), (useLargeIcons ? 56 : 48))); + deviceProfiles.add(new DeviceProfile("Nexus 4", + 335, 567, 4, 4, (useLargeIcons ? DEFAULT_ICON_SIZE_DP : 56), 13, (hasAA ? 5 : 5), (useLargeIcons ? 56 : 48))); deviceProfiles.add(new DeviceProfile("Nexus 5", 359, 567, 4, 4, (useLargeIcons ? DEFAULT_ICON_SIZE_DP : 56), 13, (hasAA ? 5 : 5), 56)); - deviceProfiles.add(new DeviceProfile("Nexus 4", - 359, 518, 4, 4, (useLargeIcons ? DEFAULT_ICON_SIZE_DP : 52), 13, (hasAA ? 5 : 5), (useLargeIcons ? 56 : 48))); - deviceProfiles.add(new DeviceProfile("Large Phone", - 335, 567, 4, 4, (useLargeIcons ? DEFAULT_ICON_SIZE_DP : 56), 13, (hasAA ? 5 : 5), 56)); deviceProfiles.add(new DeviceProfile("Large Phone", 406, 694, 5, 5, (useLargeIcons ? 64 : 56), 14.4f, 5, 56)); // The tablet profile is odd in that the landscape orientation |