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

Commit 423178c7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Match taskbar edge padding to nav button end insets" into main

parents ddf21252 20e420ca

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

+4 −2
Original line number Diff line number Diff line
@@ -198,11 +198,13 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
    private int calculateMaxNumIcons() {

        DeviceProfile deviceProfile = mActivityContext.getDeviceProfile();

        int availableWidth = deviceProfile.widthPx;

        int defaultEdgeMargin =

                (int) getResources().getDimension(deviceProfile.inv.inlineNavButtonsEndSpacing);



        // Reserve space required for edge margins, or for navbar if shown. If task bar needs to be

        // center aligned with nav bar shown, reserve space on both sides.

        availableWidth -= Math.max(deviceProfile.edgeMarginPx, deviceProfile.hotseatBarEndOffset);

        availableWidth -= Math.max(deviceProfile.edgeMarginPx,

        availableWidth -= Math.max(defaultEdgeMargin, deviceProfile.hotseatBarEndOffset);

        availableWidth -= Math.max(defaultEdgeMargin,

                mShouldTryStartAlign ? 0 : deviceProfile.hotseatBarEndOffset);



        // The space taken by an item icon used during layout.