diff --git a/res/layout/widgets_full_sheet_search_and_recommendations.xml b/res/layout/widgets_full_sheet_search_and_recommendations.xml index e322c6ca87..bfce01d148 100644 --- a/res/layout/widgets_full_sheet_search_and_recommendations.xml +++ b/res/layout/widgets_full_sheet_search_and_recommendations.xml @@ -46,7 +46,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/widgets_recommendation_background" - android:paddingVertical="8dp" + android:paddingVertical="@dimen/recommended_widgets_table_vertical_padding" android:layout_marginTop="16dp" android:visibility="gone"/> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 8a160bd103..600a550700 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -118,6 +118,7 @@ 16dp 14sp + 8dp 28dp 4dp diff --git a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java index 18f1be3c90..2d3f1a0188 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java +++ b/src/com/android/launcher3/widget/picker/WidgetsRecommendationTableLayout.java @@ -42,6 +42,7 @@ public final class WidgetsRecommendationTableLayout extends TableLayout { private static final String TAG = "WidgetsRecommendationTableLayout"; private static final float DOWN_SCALE_RATIO = 0.9f; private static final float MAX_DOWN_SCALE_RATIO = 0.5f; + private final float mWidgetsRecommendationTableVerticalPadding; private final float mWidgetCellTextViewsHeight; private final float mWidgetPreviewPadding; @@ -57,6 +58,8 @@ public final class WidgetsRecommendationTableLayout extends TableLayout { public WidgetsRecommendationTableLayout(Context context, AttributeSet attrs) { super(context, attrs); // There are 1 row for title, 1 row for dimension and 2 rows for description. + mWidgetsRecommendationTableVerticalPadding = 2 * getResources() + .getDimensionPixelSize(R.dimen.widget_cell_vertical_padding); mWidgetCellTextViewsHeight = 4 * getResources().getDimension(R.dimen.widget_cell_font_size); mWidgetPreviewPadding = 2 * getResources() .getDimensionPixelSize(R.dimen.widget_preview_shortcut_padding); @@ -143,7 +146,7 @@ public final class WidgetsRecommendationTableLayout extends TableLayout { return new RecommendationTableData(List.of(), previewScale); } // A naive estimation of the widgets recommendation table height without inflation. - float totalHeight = 0; + float totalHeight = mWidgetsRecommendationTableVerticalPadding; DeviceProfile deviceProfile = Launcher.getLauncher(getContext()).getDeviceProfile(); for (int i = 0; i < recommendedWidgetsInTable.size(); i++) { List widgetItems = recommendedWidgetsInTable.get(i);