diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 3016559f96..34ee3ebe36 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -196,6 +196,8 @@ 20dp 2dp 16dp + + 0dp 24dp 0.5dp diff --git a/src/com/android/launcher3/widget/BaseWidgetSheet.java b/src/com/android/launcher3/widget/BaseWidgetSheet.java index 9de7f62529..145ad8087e 100644 --- a/src/com/android/launcher3/widget/BaseWidgetSheet.java +++ b/src/com/android/launcher3/widget/BaseWidgetSheet.java @@ -72,14 +72,21 @@ public abstract class BaseWidgetSheet extends AbstractSlideInView 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 @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; diff --git a/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java b/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java index 66562373d1..26c04f5116 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsTwoPaneSheet.java @@ -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;