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

Commit a0d49dcf authored by Steven Ng's avatar Steven Ng
Browse files

Further adjust work profile tabs paddings in the widgets picker 

Test: Open widgets picker and observe tabs paddings are correctly set.
Bug: 188872382
Change-Id: Ib6a735bf2b0710f86b8641533cadb27116049341
parent fa7c98ee

res/values/dimens.xml

+6 −1
Original line number Diff line number Diff line
@@ -123,6 +123,11 @@ 


    <dimen name="recommended_widgets_table_vertical_padding">8dp</dimen>



    <!-- Bottom margin for the search and recommended widgets container without work profile -->

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

    <!-- Bottom margin for the search and recommended widgets container with work profile -->

    <dimen name="search_and_recommended_widgets_container_small_bottom_margin">10dp</dimen>



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

    <dimen name="widget_list_content_corner_radius">4dp</dimen>
@@ -146,7 +151,7 @@ 
    <dimen name="widget_picker_education_tip_width">120dp</dimen>

    <dimen name="widget_picker_education_tip_min_margin">4dp</dimen>



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

    <dimen name="widget_picker_view_pager_top_padding">10dp</dimen>



    <!-- Padding applied to shortcut previews -->

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

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

+10 −0
Original line number Diff line number Diff line
@@ -122,6 +122,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;
@@ -148,6 +149,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);

    }
@@ -191,6 +196,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,