summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2014-01-16 15:07:35 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-16 15:07:35 -0800
commitce46ad2add6a3bbcacc27b5ff0ccc4589d848e64 (patch)
tree7fe56af72d417d33f48a4422117f8908c9407e4a
parent5a02d4c325e51617cab319d3e104f6e1c24b8f36 (diff)
parent1ba0a30e6545a8c313d0ef355a101f661bbf778c (diff)
downloadandroid_packages_apps_Trebuchet-ce46ad2add6a3bbcacc27b5ff0ccc4589d848e64.tar.gz
android_packages_apps_Trebuchet-ce46ad2add6a3bbcacc27b5ff0ccc4589d848e64.tar.bz2
android_packages_apps_Trebuchet-ce46ad2add6a3bbcacc27b5ff0ccc4589d848e64.zip
am 1ba0a30e: Merge "Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)" into jb-ub-now-kermit
* commit '1ba0a30e6545a8c313d0ef355a101f661bbf778c': Adding new bucket for inbetween phone-tablet layouts. (Bug 11993166)
-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",