| commit | d9bd2e11194855376a0398dcf7c5fc7df9d26e3c | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Mar 24 01:42:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 24 01:42:13 2021 +0000 |
| tree | f3940a123746c9a92fd1ecc694a88e35202f274a | |
| parent | 1e1e3a67b076312c4414ceea831cb7231df37692 [diff] | |
| parent | 9187337d15e28651207936f01e97553c215316bc [diff] |
Merge "Fix spring loaded scale when taskbar is present" into sc-dev am: 9187337d15 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13933465 Change-Id: If33ca9ac9934fe9f1ad05ca6600f9e1cb78a39db
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;