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

Commit 646c95e6 authored by Jordan Silva's avatar Jordan Silva Committed by Android (Google) Code Review
Browse files

Merge "Fix wrong number of columns for AllApps calculation" into main

parents 6dfa8521 8b3fa14e

src/com/android/launcher3/DeviceProfile.java

+1 −2
Original line number Diff line number Diff line
@@ -592,7 +592,6 @@ public class DeviceProfile { 
            int availableResponsiveWidth =

                    availableWidthPx - (isVerticalBarLayout() ? hotseatBarSizePx : 0);

            int numWorkspaceColumns = getPanelCount() * inv.numColumns;

            int numAllAppsColumns = getPanelCount() * inv.numAllAppsColumns;

            // don't use availableHeightPx because it subtracts mInsets.bottom

            int availableResponsiveHeight = heightPx - mInsets.top

                    - (isVerticalBarLayout() ? 0 : hotseatBarSizePx);
@@ -612,7 +611,7 @@ public class DeviceProfile { 
                            isTwoPanels ? inv.allAppsSpecsTwoPanelId : inv.allAppsSpecsId),

                    ResponsiveSpecType.AllApps);

            mResponsiveAllAppsWidthSpec = allAppsSpecs.getCalculatedSpec(responsiveAspectRatio,

                    DimensionType.WIDTH, numAllAppsColumns, availableWidthPx,

                    DimensionType.WIDTH, numShownAllAppsColumns, availableWidthPx,

                    mResponsiveWorkspaceWidthSpec);

            mResponsiveAllAppsHeightSpec = allAppsSpecs.getCalculatedSpec(responsiveAspectRatio,

                    DimensionType.HEIGHT, inv.numRows,  heightPx - mInsets.top,