diff --git a/res/values/dimens.xml b/res/values/dimens.xml index c5f36ce2ea..6158e945b7 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -124,6 +124,11 @@ 8dp + + 16dp + + 10dp + 28dp 4dp @@ -147,7 +152,7 @@ 120dp 4dp - 16dp + 10dp 0dp diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java index fb6ac0e090..62af283765 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java @@ -123,6 +123,7 @@ public class WidgetsFullSheet extends BaseWidgetSheet }; private final int mTabsHeight; private final int mViewPagerTopPadding; + private final int mSearchAndRecommendationContainerBottomMargin; private final int mWidgetCellHorizontalPadding; @Nullable private WidgetsRecyclerView mCurrentWidgetsRecyclerView; @@ -149,6 +150,10 @@ public class WidgetsFullSheet extends BaseWidgetSheet ? getContext().getResources() .getDimensionPixelSize(R.dimen.widget_picker_view_pager_top_padding) : 0; + mSearchAndRecommendationContainerBottomMargin = getContext().getResources() + .getDimensionPixelSize(mHasWorkProfile + ? R.dimen.search_and_recommended_widgets_container_small_bottom_margin + : R.dimen.search_and_recommended_widgets_container_bottom_margin); mWidgetCellHorizontalPadding = 2 * getResources().getDimensionPixelOffset( R.dimen.widget_cell_horizontal_padding); } @@ -192,6 +197,11 @@ public class WidgetsFullSheet extends BaseWidgetSheet mNoWidgetsView = findViewById(R.id.no_widgets_text); mSearchAndRecommendationViewHolder = new SearchAndRecommendationViewHolder( findViewById(R.id.search_and_recommendations_container)); + TopRoundedCornerView.LayoutParams layoutParams = + (TopRoundedCornerView.LayoutParams) + mSearchAndRecommendationViewHolder.mContainer.getLayoutParams(); + layoutParams.bottomMargin = mSearchAndRecommendationContainerBottomMargin; + mSearchAndRecommendationViewHolder.mContainer.setLayoutParams(layoutParams); mSearchAndRecommendationsScrollController = new SearchAndRecommendationsScrollController( mHasWorkProfile, mTabsHeight,