commit 9187337d15e28651207936f01e97553c215316bc
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 24 00:43:33 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 24 00:43:33 2021 +0000
tree f3940a123746c9a92fd1ecc694a88e35202f274a
parent cb6dff62d9866185abccab0cb4f99b104517aaef
parent 9053b9075150301c272d4950667c02877802ea2b

Merge "Fix spring loaded scale when taskbar is present" into sc-dev

src/com/android/launcher3/states/SpringLoadedState.java

diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java
index fce8fff..d593013 100644
--- a/src/com/android/launcher3/states/SpringLoadedState.java
+++ b/src/com/android/launcher3/states/SpringLoadedState.java
@@ -59,10 +59,11 @@
 
         float scale = grid.workspaceSpringLoadShrinkFactor;
         Rect insets = launcher.getDragLayer().getInsets();
+        int insetsBottom = grid.isTaskbarPresent ? grid.taskbarSize : insets.bottom;
 
         float scaledHeight = scale * ws.getNormalChildHeight();
         float shrunkTop = insets.top + grid.dropTargetBarSizePx;
-        float shrunkBottom = ws.getMeasuredHeight() - insets.bottom
+        float shrunkBottom = ws.getMeasuredHeight() - insetsBottom
                 - grid.workspacePadding.bottom
                 - grid.workspaceSpringLoadedBottomSpace;
         float totalShrunkSpace = shrunkBottom - shrunkTop;