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

This commit is contained in:
Adam Cohen
2014-01-18 00:21:56 +00:00
committed by Android (Google) Code Review
+4 -2
View File
@@ -70,9 +70,11 @@ public class DynamicGrid {
deviceProfiles.add(new DeviceProfile("Nexus S", deviceProfiles.add(new DeviceProfile("Nexus S",
296, 491.33f, 4, 4, 48, 13, (hasAA ? 5 : 5), 48)); 296, 491.33f, 4, 4, 48, 13, (hasAA ? 5 : 5), 48));
deviceProfiles.add(new DeviceProfile("Nexus 4", 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", 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 // The tablet profile is odd in that the landscape orientation
// also includes the nav bar on the side // also includes the nav bar on the side
deviceProfiles.add(new DeviceProfile("Nexus 7", deviceProfiles.add(new DeviceProfile("Nexus 7",