summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-01-17 16:23:19 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-17 16:23:19 -0800
commitf488644c2cbfa831aab1077e59458879cb7511a2 (patch)
tree747458c586123079635668e4fe2c6319bd094868 /src/com/android
parent0d5de134258f71269a2d3b846521544bbad2a2eb (diff)
parenta4db090b1345038a89a38ba8af6ac74f71e2ed7c (diff)
downloadandroid_packages_apps_Trebuchet-f488644c2cbfa831aab1077e59458879cb7511a2.tar.gz
android_packages_apps_Trebuchet-f488644c2cbfa831aab1077e59458879cb7511a2.tar.bz2
android_packages_apps_Trebuchet-f488644c2cbfa831aab1077e59458879cb7511a2.zip
am a4db090b: Merge "Adding specific buckets for N5 in dynamic grid. (Bug 12604220)" into jb-ub-now-kermit
* commit 'a4db090b1345038a89a38ba8af6ac74f71e2ed7c': Adding specific buckets for N5 in dynamic grid. (Bug 12604220)
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/launcher3/DynamicGrid.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index cbde99113..447bb1cd8 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -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",