PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '5c7c3c9b8d9d2bc91b40e4d0cfe12dc31787720b':
  Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
  Fix overlapping pages (issue 12551580)
This commit is contained in:
Jim Guggemos
2014-02-15 00:24:01 +00:00
committed by Android Git Automerger
parent 41610caa87 5c7c3c9b8d
commit 0d68c0cf95
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/DynamicGrid.java
+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",