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

Commit 37a1664f authored by Thales Lima's avatar Thales Lima Committed by Automerger Merge Worker
Browse files

Merge "Fix height of hotseat" into tm-dev am: 60dc19cb 

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

Change-Id: Iceb0e48c0fce10637917830fe797bd0fc22d2b8a
parents cda49fb6 60dc19cb

src/com/android/launcher3/DeviceProfile.java

+2 −2
Original line number Diff line number Diff line
@@ -998,7 +998,7 @@ public class DeviceProfile { 
                additionalLeftSpace = qsbWidth + hotseatBorderSpace;

            }



            int hotseatTopDiff = hotseatHeight - taskbarOffset;

            int hotseatTopPadding = hotseatHeight - taskbarOffset - hotseatCellHeightPx;



            int endOffset = ApiWrapper.getHotseatEndOffset(context);

            int requiredWidth = iconSizePx * numShownHotseatIcons
@@ -1007,7 +1007,7 @@ public class DeviceProfile { 


            int hotseatSize = Math.min(requiredWidth, availableWidthPx - endOffset);

            int sideSpacing = (availableWidthPx - hotseatSize) / 2;

            mHotseatPadding.set(sideSpacing + additionalLeftSpace, hotseatTopDiff, sideSpacing,

            mHotseatPadding.set(sideSpacing + additionalLeftSpace, hotseatTopPadding, sideSpacing,

                    taskbarOffset);



            if (endOffset > sideSpacing) {

src/com/android/launcher3/Hotseat.java

+2 −3
Original line number Diff line number Diff line
@@ -111,10 +111,9 @@ public class Hotseat extends CellLayout implements Insettable { 
            mQsb.setVisibility(View.VISIBLE);

            lp.gravity = Gravity.BOTTOM;

            lp.width = ViewGroup.LayoutParams.MATCH_PARENT;

            lp.height = (grid.isTaskbarPresent

            lp.height = grid.isTaskbarPresent

                    ? grid.workspacePadding.bottom

                        : grid.hotseatBarSizePx)

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

                    : grid.hotseatBarSizePx + insets.bottom;

        }



        Rect padding = grid.getHotseatLayoutPadding(getContext());