Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c7c3c9b authored by Jim Guggemos's avatar Jim Guggemos Committed by Android Git Automerger
Browse files

am 608401ac: Merge remote-tracking branch \'goog/jb-ub-now-kermit\' into kermit-release 

* commit '608401ac':
  Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
  Fix overlapping pages (issue 12551580)
parents b5abf2a0 608401ac

src/com/android/launcher3/DynamicGrid.java

+4 −2
Original line number Diff line number Diff line
@@ -70,9 +70,11 @@ public class DynamicGrid { 
        deviceProfiles.add(new DeviceProfile("Nexus S",

                296, 491.33f,  4, 4,  48, 13, (hasAA ? 5 : 5), 48));

        deviceProfiles.add(new DeviceProfile("Nexus 4",

                359, 518,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56));

                335, 567,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56));

        deviceProfiles.add(new DeviceProfile("Nexus 5",

                359, 567,  4, 4,  DEFAULT_ICON_SIZE_DP, 13, (hasAA ? 5 : 5), 56));

        deviceProfiles.add(new DeviceProfile("Large Phone",

                400, 680,  5, 5,  64, 14.4f,  5, 56));

                406, 694,  5, 5,  64, 14.4f,  5, 56));

        // The tablet profile is odd in that the landscape orientation

        // also includes the nav bar on the side

        deviceProfiles.add(new DeviceProfile("Nexus 7",