diff options
author | Tony Wickham <twickham@google.com> | 2021-09-15 15:44:05 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2021-09-21 13:52:43 -0700 |
commit | 21970ccd290c6d95ba87c8b7c213adc4fdde6ffc (patch) | |
tree | f277b0845af92e876fbb0bf6af533c1c52919760 /src/com/android/launcher3/pageindicators | |
parent | 7eb5b5386505663ed5d2b8570e85e6bf7dc81a88 (diff) | |
download | Launcher3-21970ccd290c6d95ba87c8b7c213adc4fdde6ffc.tar.gz |
Remove nonOverlappingTaskarInsets
- Override our insets in LauncherRootView to explicitly only care about nav bar size, ignoring any insets due to taskbar.
- Previously we used nonOverlappingTaskbarInsets to belatedly subtract from measurements in e.g. DeviceProfile, but now we can revert most of those calculations since we effectively subtract taskbar insets at the root.
Test: visual in different orientations and navigation modes, and testPressHomeOnAllAppsContextMenu to ensure REQUEST_WINDOW_INSETS still works for automated tests
Fixes: 200607741
Change-Id: I8de5a268c686a1354b4beaa30e101bab6bed5af9
Diffstat (limited to 'src/com/android/launcher3/pageindicators')
-rw-r--r-- | src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java index f73d782685..c685891dac 100644 --- a/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java +++ b/src/com/android/launcher3/pageindicators/WorkspacePageIndicator.java @@ -268,9 +268,7 @@ public class WorkspacePageIndicator extends View implements Insettable, PageIndi } else { lp.leftMargin = lp.rightMargin = 0; lp.gravity = Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM; - lp.bottomMargin = grid.isTaskbarPresent - ? grid.workspacePadding.bottom + grid.taskbarSize - : grid.hotseatBarSizePx + insets.bottom; + lp.bottomMargin = grid.hotseatBarSizePx + insets.bottom; } setLayoutParams(lp); } |