Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b31d8fc3 authored by Tony Wickham's avatar Tony Wickham
Browse files

Use taskbarSize as bottom inset when taskbar is present. 

This was done in ag/13841736 but not included in ag/13821586

Test: QSB in correct position when taskbar present and not present
Bug: 171917176
Change-Id: I6aa220559afebe8710b5f01cdec9c2baa9f4c926
parent 93f2b752

quickstep/src/com/android/launcher3/taskbar/TaskbarController.java

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ public class TaskbarController { 
    public void alignRealHotseatWithTaskbar() {

        Rect hotseatBounds = new Rect();

        DeviceProfile grid = mLauncher.getDeviceProfile();

        int hotseatHeight = grid.workspacePadding.bottom + grid.getInsets().bottom;

        int hotseatHeight = grid.workspacePadding.bottom + grid.taskbarSize;

        int hotseatTopDiff = hotseatHeight - grid.taskbarSize;



        mTaskbarView.getHotseatBoundsAtScale(getTaskbarScaleOnHome()).roundOut(hotseatBounds);

src/com/android/launcher3/Hotseat.java

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class Hotseat extends CellLayout implements Insettable { 
            lp.height = (grid.isTaskbarPresent

                        ? grid.workspacePadding.bottom

                        : grid.hotseatBarSizePx)

                    + insets.bottom;

                    + (grid.isTaskbarPresent ? grid.taskbarSize : insets.bottom);

        }



        if (!grid.isTaskbarPresent) {
@@ -214,7 +214,7 @@ public class Hotseat extends CellLayout implements Insettable { 
                : dp.hotseatBarSizePx - dp.hotseatCellHeightPx - mQsbHeight;

        int bottom = b - t

                - (int) (freeSpace * QSB_CENTER_FACTOR)

                - dp.getInsets().bottom;

                - (dp.isTaskbarPresent ? dp.taskbarSize : dp.getInsets().bottom);

        int top = bottom - mQsbHeight;

        mQsb.layout(left, top, right, bottom);

    }