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

Commit 41d7363d authored by Kshitij's avatar Kshitij
Browse files

fix!: Remove unintended recursion on updateHotseatSizes

parent d38c33d6

src/com/android/launcher3/DeviceProfile.java

+11 −10
Original line number Diff line number Diff line
@@ -577,6 +577,17 @@ public class DeviceProfile { 
                isTwoPanels ? inv.numDatabaseAllAppsColumns : inv.numAllAppsColumns;



        this.context = context;



        springLoadedHotseatBarTopMarginPx = shouldApplyWidePortraitDimens

                ? res.getDimensionPixelSize(R.dimen.spring_loaded_hotseat_top_margin_wide_portrait)

                : res.getDimensionPixelSize(R.dimen.spring_loaded_hotseat_top_margin);



        if (mIsResponsiveGrid) {

            updateHotseatSizes(mResponsiveWorkspaceCellSpec.getIconSize());

        } else {

            updateHotseatSizes(pxFromDp(inv.iconSize[mTypeIndex], mMetrics));

        }



        if (areNavButtonsInline && !isPhone) {

            inlineNavButtonsEndSpacingPx =

                    res.getDimensionPixelSize(inv.inlineNavButtonsEndSpacing);
@@ -899,16 +910,6 @@ public class DeviceProfile { 
            }

        }



        springLoadedHotseatBarTopMarginPx = shouldApplyWidePortraitDimens

                ? res.getDimensionPixelSize(R.dimen.spring_loaded_hotseat_top_margin_wide_portrait)

                : res.getDimensionPixelSize(R.dimen.spring_loaded_hotseat_top_margin);



        if (mIsResponsiveGrid) {

            updateHotseatSizes(mResponsiveWorkspaceCellSpec.getIconSize());

        } else {

            updateHotseatSizes(pxFromDp(inv.iconSize[mTypeIndex], mMetrics));

        }



        hotseatBarBottomSpacePx += mInfo.cutout.bottom;

        hotseatBarBottomSpacePx += (areNavButtonsInline && FORCE_LAYOUT_ALL_HOTSEAT_ICONS

                ? context.getResources().getDimensionPixelSize(R.dimen.taskbar_size)