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

Commit f1424a3b authored by Samuel Fufa's avatar Samuel Fufa
Browse files

Decouple grid size and widget preview size in WidgetsRecyclerView 

Test: Manual
Bug:142148773
Change-Id: I59aa29e95ddb7d6002a88cf853bae5fcf9811154
parent 055c22e8

src/com/android/launcher3/DeviceProfile.java

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ public class DeviceProfile { 


    // All apps

    public int allAppsCellHeightPx;

    public int allAppsCellWidthPx;

    public int allAppsIconSizePx;

    public int allAppsIconDrawablePaddingPx;

    public float allAppsIconTextSizePx;
@@ -349,6 +350,7 @@ public class DeviceProfile { 
            allAppsIconDrawablePaddingPx = iconDrawablePaddingPx;

            allAppsCellHeightPx = getCellSize().y;

        }

        allAppsCellWidthPx = allAppsIconSizePx + allAppsIconDrawablePaddingPx;



        if (isVerticalBarLayout()) {

            // Always hide the Workspace text with vertical bar layout.

src/com/android/launcher3/WidgetPreviewLoader.java

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ public class WidgetPreviewLoader { 


    private Bitmap generateShortcutPreview(BaseActivity launcher, ShortcutConfigActivityInfo info,

            int maxWidth, int maxHeight, Bitmap preview) {

        int iconSize = launcher.getDeviceProfile().iconSizePx;

        int iconSize = launcher.getDeviceProfile().allAppsIconSizePx;

        int padding = launcher.getResources()

                .getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding);

src/com/android/launcher3/widget/WidgetCell.java

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public class WidgetCell extends LinearLayout implements OnLayoutChangeListener { 


    private void setContainerWidth() {

        DeviceProfile profile = mActivity.getDeviceProfile();

        mCellSize = (int) (profile.cellWidthPx * WIDTH_SCALE);

        mCellSize = (int) (profile.allAppsCellWidthPx * WIDTH_SCALE);

        mPresetPreviewSize = (int) (mCellSize * PREVIEW_SCALE);

    }