Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release

at a4db090b13
This commit is contained in:
Jim Guggemos
2014-01-17 17:24:31 -07:00
+4 -2
View File
@@ -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",