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

Commit 8b3fa14e authored by Jordan Silva's avatar Jordan Silva
Browse files

Fix wrong number of columns for AllApps calculation 

Fix: 310657769
Flag: ACONFIG com.android.launcher3.enable_responsive_workspace TEAMFOOD
Test: DeviceProfileDumpTest
Test: DeviceProfileResponsiveDumpTest
Change-Id: Id46c9e4529176b68f6d92d31a71016ed4f8134d1
parent c0f35cce

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,