Merge "Fix spring loaded scale when taskbar is present" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
9187337d15
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user