commit 89e28303a3153362649f71d12e02b775b0171347
author Jonathan Miranda <jonmiranda@google.com> Thu Jun 03 21:11:54 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 03 21:11:54 2021 +0000
tree 6895f24b700f54ce4ce9c6c0cd5fed013f856c8f
parent e2a414004316c81cc1b8abdef3497ca9144ab00f
parent df3caf72749735349168f158ba21b059e52bcc87

Merge "Only inset widgets if workspaceTopPadding is greater than the widget padding." into sc-dev am: 3ed65ede16 am: 328a2bd5ef am: df3caf7274

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14823934

Change-Id: I2e3aca701d66fa911e744d21737ff57117d0c0e6

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index cdc09f1..e9245b0 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -399,8 +399,10 @@
     public boolean shouldInsetWidgets() {
         Rect widgetPadding = inv.defaultWidgetPadding;
 
-        // Check all sides to ensure that the widget won't overlap into another cell.
-        return cellLayoutBorderSpacingPx > widgetPadding.left
+        // Check all sides to ensure that the widget won't overlap into another cell, or into
+        // status bar.
+        return workspaceTopPadding > widgetPadding.top
+                && cellLayoutBorderSpacingPx > widgetPadding.left
                 && cellLayoutBorderSpacingPx > widgetPadding.top
                 && cellLayoutBorderSpacingPx > widgetPadding.right
                 && cellLayoutBorderSpacingPx > widgetPadding.bottom;