diff options
| author | Nebojsa Cvetkovic <nebkat@gmail.com> | 2013-12-15 20:50:59 +0000 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-01-24 16:25:19 -0800 |
| commit | 04d59a5a3bda757080acf34a974474317e7a6ab3 (patch) | |
| tree | 1fe989b84bb78abb4a2211a846326ff95e02ef56 /src/com/android/launcher3/DynamicGrid.java | |
| parent | 9d02fc3d0e2ee6e164227737045f1375902eb018 (diff) | |
| download | android_packages_apps_Trebuchet-04d59a5a3bda757080acf34a974474317e7a6ab3.tar.gz android_packages_apps_Trebuchet-04d59a5a3bda757080acf34a974474317e7a6ab3.tar.bz2 android_packages_apps_Trebuchet-04d59a5a3bda757080acf34a974474317e7a6ab3.zip | |
DynamicGrid: Use large icons
Change-Id: I4cdd15c82bbedd7b54051c3a79d63b6c1238a71a
Diffstat (limited to 'src/com/android/launcher3/DynamicGrid.java')
| -rw-r--r-- | src/com/android/launcher3/DynamicGrid.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/com/android/launcher3/DynamicGrid.java b/src/com/android/launcher3/DynamicGrid.java index a6a143c1e..5bbb9214f 100644 --- a/src/com/android/launcher3/DynamicGrid.java +++ b/src/com/android/launcher3/DynamicGrid.java @@ -512,26 +512,28 @@ public class DynamicGrid { ArrayList<DeviceProfile> deviceProfiles = new ArrayList<DeviceProfile>(); boolean hasAA = !AppsCustomizePagedView.DISABLE_ALL_APPS; + boolean useLargeIcons = SettingsProvider.getBoolean(context, SettingsProvider.SETTINGS_UI_GENERAL_LARGE_ICONS, + R.bool.preferences_interface_general_large_icons_default); // Our phone profiles include the bar sizes in each orientation deviceProfiles.add(new DeviceProfile("Super Short Stubby", - 255, 300, 2, 3, 48, 13, (hasAA ? 5 : 4), 48)); + 255, 300, 2, 3, (useLargeIcons ? 54 : 48), 13, (hasAA ? 5 : 4), (useLargeIcons ? 54 : 48))); deviceProfiles.add(new DeviceProfile("Shorter Stubby", - 255, 400, 3, 3, 48, 13, (hasAA ? 5 : 4), 48)); + 255, 400, 3, 3, (useLargeIcons ? 54 : 48), 13, (hasAA ? 5 : 4), (useLargeIcons ? 54 : 48))); deviceProfiles.add(new DeviceProfile("Short Stubby", - 275, 420, 3, 4, 48, 13, (hasAA ? 5 : 4), 48)); + 275, 420, 3, 4, (useLargeIcons ? 54 : 48), 13, (hasAA ? 5 : 4), (useLargeIcons ? 54 : 48))); deviceProfiles.add(new DeviceProfile("Stubby", - 255, 450, 3, 4, 48, 13, (hasAA ? 5 : 4), 48)); + 255, 450, 3, 4, (useLargeIcons ? 54 : 48), 13, (hasAA ? 5 : 4), (useLargeIcons ? 54 : 48))); deviceProfiles.add(new DeviceProfile("Nexus S", - 296, 491.33f, 4, 4, 48, 13, (hasAA ? 5 : 4), 48)); + 296, 491.33f, 4, 4, (useLargeIcons ? 56 : 48), 13, (hasAA ? 5 : 4), (useLargeIcons ? 56 : 48))); deviceProfiles.add(new DeviceProfile("Nexus 4", - 359, 518, 4, 4, 60, 13, (hasAA ? 5 : 4), 56)); + 359, 518, 4, 4, (useLargeIcons ? 60 : 52), 13, (hasAA ? 5 : 4), (useLargeIcons ? 56 : 48))); // The tablet profile is odd in that the landscape orientation // also includes the nav bar on the side deviceProfiles.add(new DeviceProfile("Nexus 7", - 575, 904, 6, 6, 72, 14.4f, 7, 60)); + 575, 904, 6, 6, (useLargeIcons ? 72 : 60), 14.4f, 7, (useLargeIcons ? 60 : 52))); // Larger tablet profiles always have system bars on the top & bottom deviceProfiles.add(new DeviceProfile("Nexus 10", - 727, 1207, 5, 8, 80, 14.4f, 9, 64)); + 727, 1207, 5, 8, (useLargeIcons ? 80 : 64), 14.4f, 9, (useLargeIcons ? 64 : 56))); /* deviceProfiles.add(new DeviceProfile("Nexus 7", 600, 960, 5, 5, 72, 14.4f, 5, 60)); @@ -539,7 +541,7 @@ public class DynamicGrid { 800, 1280, 5, 5, 80, 14.4f, (hasAA ? 7 : 6), 64)); */ deviceProfiles.add(new DeviceProfile("20-inch Tablet", - 1527, 2527, 7, 7, 100, 20, 7, 72)); + 1527, 2527, 7, 7, (useLargeIcons ? 100 : 80), 20, 7, (useLargeIcons ? 72 : 64))); mMinWidth = dpiFromPx(minWidthPx, dm); mMinHeight = dpiFromPx(minHeightPx, dm); mProfile = new DeviceProfile(context, deviceProfiles, |