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

Commit 4076cae8 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Use taskbarSize as bottom inset when taskbar is present." into sc-dev

parents 9751c532 b31d8fc3

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
@@ -122,7 +122,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) {
@@ -209,7 +209,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);

    }