summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2023-06-06 19:48:19 -0700
committerJon Miranda <jonmiranda@google.com>2023-06-07 11:19:50 -0700
commit95f4472ba9fc862b04f26d8e4e6cd1edf3526d78 (patch)
tree652c5bf377eb227074bb82db410439ba377182d2 /src
parent57eaf86f8ded70c9bb448459e33621c4696a8755 (diff)
downloadLauncher3-95f4472ba9fc862b04f26d8e4e6cd1edf3526d78.tar.gz
Update taskbar paddings/sizes to match spec.
Bug: 282798528 Test: manual with screenshots Change-Id: I00c646d9cd11a9015e14f8311ba2ff233d8321ac
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/DeviceProfile.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index fb41044875..fa1cbd60db 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -26,6 +26,7 @@ import static com.android.launcher3.anim.Interpolators.LINEAR;
import static com.android.launcher3.config.FeatureFlags.ENABLE_MULTI_DISPLAY_PARTIAL_DEPTH;
import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.ICON_OVERLAP_FACTOR;
import static com.android.launcher3.icons.GraphicsUtils.getShapePath;
+import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
import static com.android.launcher3.testing.shared.ResourceUtils.INVALID_RESOURCE_HANDLE;
import static com.android.launcher3.testing.shared.ResourceUtils.pxFromDp;
import static com.android.launcher3.testing.shared.ResourceUtils.roundPxValueFromFloat;
@@ -353,8 +354,8 @@ public class DeviceProfile {
if (DisplayController.isTransientTaskbar(context)) {
float invTransientIconSizeDp = inv.transientTaskbarIconSize[mTypeIndex];
taskbarIconSize = pxFromDp(invTransientIconSizeDp, mMetrics);
- taskbarHeight = taskbarIconSize
- + (2 * res.getDimensionPixelSize(R.dimen.transient_taskbar_padding));
+ taskbarHeight = Math.round((taskbarIconSize * ICON_VISIBLE_AREA_FACTOR)
+ + (2 * res.getDimensionPixelSize(R.dimen.transient_taskbar_padding)));
stashedTaskbarHeight =
res.getDimensionPixelSize(R.dimen.transient_taskbar_stashed_height);
taskbarBottomMargin =