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

Commit 6ea4a31c authored by Pat Manning's avatar Pat Manning Committed by Automerger Merge Worker
Browse files

Merge "Adjust grid cell visualizations." into tm-dev am: 4349d212 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17586930



Change-Id: I7f92034213bd884455c314ee0cc3c4d13b309ab0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12d8747d 4349d212

res/values-land/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -37,4 +37,7 @@ 
    <dimen name="drop_target_button_drawable_vertical_padding">2dp</dimen>

    <dimen name="drop_target_top_margin">6dp</dimen>

    <dimen name="drop_target_bottom_margin">6dp</dimen>



    <!-- Workspace grid visualization parameters -->

    <dimen name="grid_visualization_horizontal_cell_spacing">24dp</dimen>

</resources>

res/values-sw600dp/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -46,4 +46,7 @@ 
    <dimen name="drop_target_button_drawable_horizontal_padding">16dp</dimen>

    <dimen name="drop_target_button_drawable_vertical_padding">16dp</dimen>

    <dimen name="dynamic_grid_drop_target_size">56dp</dimen>



<!-- Workspace grid visualization parameters -->

    <dimen name="grid_visualization_horizontal_cell_spacing">6dp</dimen>

</resources>

res/values/dimens.xml

+3 −2
Original line number Diff line number Diff line
@@ -381,8 +381,9 @@ 




<!-- Workspace grid visualization parameters -->

    <dimen name="grid_visualization_rounding_radius">22dp</dimen>

    <dimen name="grid_visualization_cell_spacing">6dp</dimen>

    <dimen name="grid_visualization_rounding_radius">28dp</dimen>

    <dimen name="grid_visualization_horizontal_cell_spacing">6dp</dimen>

    <dimen name="grid_visualization_vertical_cell_spacing">6dp</dimen>



<!-- Search results related parameters -->

    <dimen name="search_row_icon_size">48dp</dimen>

src/com/android/launcher3/CellLayout.java

+8 −5
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ public class CellLayout extends ViewGroup { 
    private boolean mVisualizeDropLocation = true;

    private RectF mVisualizeGridRect = new RectF();

    private Paint mVisualizeGridPaint = new Paint();

    private int mGridVisualizationPadding;

    private int mGridVisualizationPaddingX;

    private int mGridVisualizationPaddingY;

    private int mGridVisualizationRoundingRadius;

    private float mGridAlpha = 0f;

    private int mGridColor = 0;
@@ -260,8 +261,10 @@ public class CellLayout extends ViewGroup { 
        mBackground.setAlpha(0);



        mGridColor = Themes.getAttrColor(getContext(), R.attr.workspaceAccentColor);

        mGridVisualizationPadding =

                res.getDimensionPixelSize(R.dimen.grid_visualization_cell_spacing);

        mGridVisualizationPaddingX = res.getDimensionPixelSize(

                R.dimen.grid_visualization_horizontal_cell_spacing);

        mGridVisualizationPaddingY = res.getDimensionPixelSize(

                R.dimen.grid_visualization_vertical_cell_spacing);

        mGridVisualizationRoundingRadius =

                res.getDimensionPixelSize(R.dimen.grid_visualization_rounding_radius);

        mReorderPreviewAnimationMagnitude = (REORDER_PREVIEW_MAGNITUDE * deviceProfile.iconSizePx);
@@ -591,8 +594,8 @@ public class CellLayout extends ViewGroup { 


    protected void visualizeGrid(Canvas canvas) {

        DeviceProfile dp = mActivity.getDeviceProfile();

        int paddingX = (int) Math.min((mCellWidth - dp.iconSizePx) / 2, mGridVisualizationPadding);

        int paddingY = (int) Math.min((mCellHeight - dp.iconSizePx) / 2, mGridVisualizationPadding);

        int paddingX = Math.min((mCellWidth - dp.iconSizePx) / 2, mGridVisualizationPaddingX);

        int paddingY = Math.min((mCellHeight - dp.iconSizePx) / 2, mGridVisualizationPaddingY);

        mVisualizeGridRect.set(paddingX, paddingY,

                mCellWidth - paddingX,

                mCellHeight - paddingY);