From 5225e83d71189a3e161e7b5e1fb78a9c896701ca Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Tue, 1 Aug 2023 16:32:15 +0100 Subject: [PATCH] Skip iconScale logic in responsive grid Fix: 289198168 Flag: ENABLE_RESPONSIVE_WORKSPACE Test: DeviceProfileResponsiveDumpTest, DeviceProfileResponsiveAlternativeDisplaysDumpTest Change-Id: Iefe9ab3986a6d50ac920ba7bf417c0a8f254d878 --- src/com/android/launcher3/DeviceProfile.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 28e0cf2de7..9a3480b6a8 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -886,6 +886,10 @@ public class DeviceProfile { updateIconSize(1f, res); updateWorkspacePadding(); + if (mIsResponsiveGrid) { + return 0; + } + // Check to see if the icons fit within the available height. float usedHeight = getCellLayoutHeightSpecification(); final int maxHeight = getCellLayoutHeight();