summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2014-01-16 23:06:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-01-16 23:06:29 +0000
commit1ba0a30e6545a8c313d0ef355a101f661bbf778c (patch)
tree2c9cf049abc1b8dda531ccd135cd24a7909ccc04 /src/com/android
parent08101b1f52b2b6aa8ddb82f09a18b91482b99f58 (diff)
parent6d110117bee23d7fb25b08442614b3e0b4c47a75 (diff)
downloadandroid_packages_apps_Trebuchet-1ba0a30e6545a8c313d0ef355a101f661bbf778c.tar.gz
android_packages_apps_Trebuchet-1ba0a30e6545a8c313d0ef355a101f661bbf778c.tar.bz2
android_packages_apps_Trebuchet-1ba0a30e6545a8c313d0ef355a101f661bbf778c.zip
Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)" into jb-ub-now-kermit
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/launcher3/DynamicGrid.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java
index 3aced1fae..cbde99113 100644
--- a/src/com/android/launcher3/DynamicGrid.java
+++ b/src/com/android/launcher3/DynamicGrid.java
@@ -71,6 +71,8 @@ public class DynamicGrid {
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));
+ deviceProfiles.add(new DeviceProfile("Large Phone",
+ 400, 680, 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",