diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-12-16 11:32:54 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-12-18 17:17:08 -0800 |
| commit | 96a0963c4a05c6ef9b1fc9d76e6431c510d48e69 (patch) | |
| tree | 8204318122f979e798624fbf8efb7ecc376036eb /src/com/android/launcher3/InvariantDeviceProfile.java | |
| parent | ffa123769807675869819037676717585d3fe647 (diff) | |
| download | android_packages_apps_Trebuchet-96a0963c4a05c6ef9b1fc9d76e6431c510d48e69.tar.gz android_packages_apps_Trebuchet-96a0963c4a05c6ef9b1fc9d76e6431c510d48e69.tar.bz2 android_packages_apps_Trebuchet-96a0963c4a05c6ef9b1fc9d76e6431c510d48e69.zip | |
Adding support for negative x and y in layout xml.
Fixing default configurations for some screen sizes.
> Negative values for x and y are parsed as distance from end
column and row respectively. e.g. (-1, -2) => (3, 2) in a
4x4 grid
Bug: 26110981
Change-Id: I4ca30e225ed6e2a31610ab23235d2cd10e8d317c
Diffstat (limited to 'src/com/android/launcher3/InvariantDeviceProfile.java')
| -rw-r--r-- | src/com/android/launcher3/InvariantDeviceProfile.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index a91181d5e..b3a8bbc32 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -173,9 +173,9 @@ public class InvariantDeviceProfile { // width, height, #rows, #columns, #folder rows, #folder columns, // iconSize, iconTextSize, #hotseat, #hotseatIconSize, defaultLayoutId. predefinedDeviceProfiles.add(new InvariantDeviceProfile("Super Short Stubby", - 255, 300, 2, 3, 2, 3, 3, 48, 13, 3, 48, R.xml.default_workspace_4x4)); + 255, 300, 2, 3, 2, 3, 3, 48, 13, 3, 48, R.xml.default_workspace_3x3)); predefinedDeviceProfiles.add(new InvariantDeviceProfile("Shorter Stubby", - 255, 400, 3, 3, 3, 3, 3, 48, 13, 3, 48, R.xml.default_workspace_4x4)); + 255, 400, 3, 3, 3, 3, 3, 48, 13, 3, 48, R.xml.default_workspace_3x3)); predefinedDeviceProfiles.add(new InvariantDeviceProfile("Short Stubby", 275, 420, 3, 4, 3, 4, 4, 48, 13, 5, 48, R.xml.default_workspace_4x4)); predefinedDeviceProfiles.add(new InvariantDeviceProfile("Stubby", @@ -196,7 +196,7 @@ public class InvariantDeviceProfile { predefinedDeviceProfiles.add(new InvariantDeviceProfile("Nexus 10", 727, 1207, 5, 6, 4, 5, 4, 76, 14.4f, 7, 76, R.xml.default_workspace_5x6)); predefinedDeviceProfiles.add(new InvariantDeviceProfile("20-inch Tablet", - 1527, 2527, 7, 7, 6, 6, 4, 100, 20, 7, 72, R.xml.default_workspace_4x4)); + 1527, 2527, 7, 7, 6, 6, 4, 100, 20, 7, 72, R.xml.default_workspace_5x6)); return predefinedDeviceProfiles; } |