PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix spring loaded scale when taskbar is present" into sc-dev am: 9187337d15

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

Change-Id: I976f6989ca91ac616b6b5f6c59dd33a5cadec305
This commit is contained in:
TreeHugger Robot
2021-03-24 00:53:03 +00:00
committed by Automerger Merge Worker
parent fd0a0da2ec 9187337d15
commit 357b26c8ab
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/states/SpringLoadedState.java
+2 -1
View File
@@ -59,10 +59,11 @@ public class SpringLoadedState extends LauncherState {
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;