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

Commit e66a001e authored by Shamali Patwa's avatar Shamali Patwa Committed by Android (Google) Code Review
Browse files

Merge "Fix the horizontal margins on the left panel in the two pane picker." into main

parents 5912d0f6 5e855d79

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -196,6 +196,8 @@ 
    <dimen name="widget_list_header_view_vertical_padding">20dp</dimen>

    <dimen name="widget_list_entry_spacing">2dp</dimen>

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

    <!-- Margin applied to the recycler view with search bar & the list of widget apps below it. -->

    <dimen name="widget_list_left_pane_horizontal_margin">0dp</dimen>

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



    <dimen name="widget_preview_shadow_blur">0.5dp</dimen>

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

+10 −4
Original line number Diff line number Diff line
@@ -72,14 +72,21 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView<BaseActivity> 


    public BaseWidgetSheet(Context context, AttributeSet attrs, int defStyleAttr) {

        super(context, attrs, defStyleAttr);

        mContentHorizontalMargin = getResources().getDimensionPixelSize(

                R.dimen.widget_list_horizontal_margin);

        mContentHorizontalMargin = getWidgetListHorizontalMargin();

        mWidgetCellHorizontalPadding = getResources().getDimensionPixelSize(

                R.dimen.widget_cell_horizontal_padding);

        mNavBarScrimPaint = new Paint();

        mNavBarScrimPaint.setColor(Themes.getNavBarScrimColor(mActivityContext));

    }



    /**

     * Returns the margins to be applied to the left and right of the widget apps list.

     */

    protected int getWidgetListHorizontalMargin() {

        return getResources().getDimensionPixelSize(

                R.dimen.widget_list_horizontal_margin);

    }



    protected int getScrimColor(Context context) {

        return context.getResources().getColor(R.color.widgets_picker_scrim);

    }
@@ -142,8 +149,7 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView<BaseActivity> 
    @Override

    public void setInsets(Rect insets) {

        mInsets.set(insets);

        @Px int contentHorizontalMargin = getResources().getDimensionPixelSize(

                R.dimen.widget_list_horizontal_margin);

        @Px int contentHorizontalMargin = getWidgetListHorizontalMargin();

        if (contentHorizontalMargin != mContentHorizontalMargin) {

            onContentHorizontalMarginChanged(contentHorizontalMargin);

            mContentHorizontalMargin = contentHorizontalMargin;

src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java

+6 −0
Original line number Diff line number Diff line
@@ -302,6 +302,12 @@ public class WidgetsTwoPaneSheet extends WidgetsFullSheet { 
        };

    }



    @Override

    protected int getWidgetListHorizontalMargin() {

        return getResources().getDimensionPixelSize(

                R.dimen.widget_list_left_pane_horizontal_margin);

    }



    @Override

    protected boolean isTwoPane() {

        return true;