| commit | 73886f379f11877a890682237c5d8f406f7672f6 | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Thu Jun 03 20:43:24 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 03 20:43:24 2021 +0000 |
| tree | e3bc11751f3dea1f4137842d2720f25e8f167ef4 | |
| parent | f647016ccedb079a01a47b0ab6789f73cc473178 [diff] | |
| parent | 3ed65ede1679021c320576c50cfe49b6651303bc [diff] |
Merge "Only inset widgets if workspaceTopPadding is greater than the widget padding." into sc-dev am: 3ed65ede16 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14823934 Change-Id: Ica0d5b9d65dcaa32aae7978ffa36e3a63c172ce1
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;