summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2015-09-29 22:24:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-29 22:24:59 +0000
commite872a420b6517c5613fba870f08494768c2f9536 (patch)
tree458349a7cdb1dc991b137b12ec178f2a458071d0
parent0b90814f8617d4078fc7f7219317a0fc3ac0f0f3 (diff)
parent58ecbe40f6e95d53b74adeeea3fd83a32cea4f38 (diff)
downloadandroid_packages_apps_Trebuchet-e872a420b6517c5613fba870f08494768c2f9536.tar.gz
android_packages_apps_Trebuchet-e872a420b6517c5613fba870f08494768c2f9536.tar.bz2
android_packages_apps_Trebuchet-e872a420b6517c5613fba870f08494768c2f9536.zip
am 58ecbe40: Flipped widths of Nexus 4 and Nexus 5 in InvariantDeviceProfile.
* commit '58ecbe40f6e95d53b74adeeea3fd83a32cea4f38': Flipped widths of Nexus 4 and Nexus 5 in InvariantDeviceProfile.
-rw-r--r--src/com/android/launcher3/InvariantDeviceProfile.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index ae204c40c..688130723 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -184,9 +184,9 @@ public class InvariantDeviceProfile {
predefinedDeviceProfiles.add(new InvariantDeviceProfile("Nexus S",
296, 491.33f, 4, 4, 4, 4, 4, 48, 13, 5, 48, R.xml.default_workspace_4x4));
predefinedDeviceProfiles.add(new InvariantDeviceProfile("Nexus 4",
- 335, 567, 4, 4, 4, 4, 4, DEFAULT_ICON_SIZE_DP, 13, 5, 56, R.xml.default_workspace_4x4));
- predefinedDeviceProfiles.add(new InvariantDeviceProfile("Nexus 5",
359, 567, 4, 4, 4, 4, 4, DEFAULT_ICON_SIZE_DP, 13, 5, 56, R.xml.default_workspace_4x4));
+ predefinedDeviceProfiles.add(new InvariantDeviceProfile("Nexus 5",
+ 335, 567, 4, 4, 4, 4, 4, DEFAULT_ICON_SIZE_DP, 13, 5, 56, R.xml.default_workspace_4x4));
predefinedDeviceProfiles.add(new InvariantDeviceProfile("Large Phone",
406, 694, 5, 5, 4, 4, 4, 64, 14.4f, 5, 56, R.xml.default_workspace_5x5));
// The tablet profile is odd in that the landscape orientation