commit a4db090b1345038a89a38ba8af6ac74f71e2ed7c
author Adam Cohen <adamcohen@google.com> Sat Jan 18 00:21:56 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 18 00:21:57 2014 +0000
tree 4346d9beee7b2e3894674cc1bc657995981a2349
parent 5ac62d6914067c48e1fcdb3f6f149532017c5803
parent 3abfd16e5d8f4af36fbe7e8c429cdd1227af1a50

Merge "Adding specific buckets for N5 in dynamic grid. (Bug 12604220)" into jb-ub-now-kermit

src/com/android/launcher3/DynamicGrid.java

diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index cbde991..447bb1c 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -70,9 +70,11 @@
         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",