diff options
author | Tony Wickham <twickham@google.com> | 2015-10-09 00:38:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-09 00:38:29 +0000 |
commit | d70a4b7b7805f0fd61cb34487b4f6cc620025723 (patch) | |
tree | 163c966e144f17f39781bffb690466d1cac79ae9 /src/com/android/launcher3/InvariantDeviceProfile.java | |
parent | 56c7360497823ed83d4eb04ef32c117e9c5608d6 (diff) | |
parent | d6b4037b093445fefa7d036da339dd549fae7a9b (diff) | |
download | android_packages_apps_Trebuchet-d70a4b7b7805f0fd61cb34487b4f6cc620025723.tar.gz android_packages_apps_Trebuchet-d70a4b7b7805f0fd61cb34487b4f6cc620025723.tar.bz2 android_packages_apps_Trebuchet-d70a4b7b7805f0fd61cb34487b4f6cc620025723.zip |
am d6b4037b: Grid adjustments, specifically for Ryu.
* commit 'd6b4037b093445fefa7d036da339dd549fae7a9b':
Grid adjustments, specifically for Ryu.
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 5914f4475..e983eb116 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -74,7 +74,7 @@ public class InvariantDeviceProfile { /** * Number of icons inside the hotseat area. */ - float numHotseatIcons; + int numHotseatIcons; float hotseatIconSize; int defaultLayoutId; @@ -98,7 +98,7 @@ public class InvariantDeviceProfile { } InvariantDeviceProfile(String n, float w, float h, int r, int c, int fr, int fc, int maapc, - float is, float its, float hs, float his, int dlId) { + float is, float its, int hs, float his, int dlId) { // Ensure that we have an odd number of hotseat items (since we need to place all apps) if (hs % 2 == 0) { throw new RuntimeException("All Device Profiles must have an odd number of hotseat spaces"); @@ -201,7 +201,7 @@ public class InvariantDeviceProfile { 575, 904, 5, 6, 4, 5, 4, 72, 14.4f, 7, 60, R.xml.default_workspace_5x6)); // Larger tablet profiles always have system bars on the top & bottom predefinedDeviceProfiles.add(new InvariantDeviceProfile("Nexus 10", - 727, 1207, 5, 6, 4, 5, 4, 76, 14.4f, 7, 64, R.xml.default_workspace_5x6)); + 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)); return predefinedDeviceProfiles; |