From c5454ec15b2849bc25cbe5812a7334af0d4c6397 Mon Sep 17 00:00:00 2001 From: cretin45 Date: Mon, 29 Feb 2016 11:23:05 -0800 Subject: Trebuchet: Scale icons in portrait if using condensed grid Issue-id: CYNGNOS-1993 Change-Id: I4b74402ebf61a7faed28a74683d87592121bb090 --- src/com/android/launcher3/DeviceProfile.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 29dec439c..51c634d4f 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -159,7 +159,7 @@ public class DeviceProfile { } // Calculate the remaining vars - updateAvailableDimensions(dm, res); + updateAvailableDimensions(dm, res, isLandscape); computeAllAppsButtonSize(context); // Search Bar @@ -181,7 +181,7 @@ public class DeviceProfile { allAppsButtonVisualSize = (int) (hotseatIconSizePx * (1 - padding)); } - private void updateAvailableDimensions(DisplayMetrics dm, Resources res) { + private void updateAvailableDimensions(DisplayMetrics dm, Resources res, boolean isLandscape) { // Check to see if the icons fit in the new available height. If not, then we need to // shrink the icon size. float scale = 1f; @@ -192,6 +192,9 @@ public class DeviceProfile { // We only care about the top and bottom workspace padding, which is not affected by RTL. Rect workspacePadding = getWorkspacePadding(false /* isLayoutRtl */); int maxHeight = (availableHeightPx - workspacePadding.top - workspacePadding.bottom); + if (!isLandscape) { //Include the hotseat and search bar if portrait + maxHeight -= (hotseatBarHeightPx + searchBarSpaceHeightPx); + } if (usedHeight > maxHeight) { scale = maxHeight / usedHeight; drawablePadding = 0; -- cgit v1.2.3