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

Commit 44fa236e authored by Shubham Basu's avatar Shubham Basu Committed by Android (Google) Code Review
Browse files

Merge "fix: adding padding top and changing default color for tab bug:... 

Merge "fix: adding padding top and changing default color for tab bug: 187798688 test: manual" into sc-mainline-prod
parents 5adb52dd 90940fb8

res/values-v31/colors.xml

+2 −3
Original line number Diff line number Diff line
@@ -33,10 +33,9 @@ 
  <color name="profile_tab_selected_color">@*android:color/system_accent1_100

  </color>

  <!-- accent 100 -->

  <color name="profile_tab_default_color">@*android:color/system_neutral1_100

  <color name="profile_tab_default_color">@*android:color/system_neutral1_10

  </color>

  <!-- neutral 100 -->



  <!-- neutral 10 -->

  <color name="fragment_pick_inactive_button_color">

    @*android:color/system_neutral1_100

  </color>

res/values-v31/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -18,7 +18,11 @@ 
    <dimen name="action_bar_margin">0dp</dimen>

    <dimen name="button_corner_radius">20dp</dimen>

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

    <dimen name="tab_height">36dp</dimen>

    <dimen name="tab_container_height">48dp</dimen>

    <dimen name="profile_tab_padding">20dp</dimen>

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

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

    <dimen name="cross_profile_button_corner_radius">30dp</dimen>

    <dimen name="cross_profile_button_stroke_width">1dp</dimen>

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

src/com/android/documentsui/ProfileTabs.java

+15 −1
Original line number Diff line number Diff line
@@ -105,6 +105,15 @@ public class ProfileTabs implements ProfileTabsAddons { 
        // Material next changes apply only for version S or greater

        if(VersionUtils.isAtLeastS()) {

            mTabSeparator.setVisibility(View.GONE);

            int tabContainerHeightInDp = (int)mTabsContainer.getContext().getResources().

                getDimension(R.dimen.tab_container_height);

            mTabsContainer.getLayoutParams().height = tabContainerHeightInDp;

            ViewGroup.MarginLayoutParams tabContainerMarginLayoutParams =

                (ViewGroup.MarginLayoutParams) mTabsContainer.getLayoutParams();

            int tabContainerMarginTop = (int)mTabsContainer.getContext().getResources().

                getDimension(R.dimen.profile_tab_margin_top);

            tabContainerMarginLayoutParams.setMargins(0, tabContainerMarginTop, 0, 0);

            mTabsContainer.requestLayout();

            for (int i = 0; i < mTabs.getTabCount(); i++) {



                // Tablayout holds a view that contains the individual tab
@@ -113,7 +122,12 @@ public class ProfileTabs implements ProfileTabsAddons { 
                // Get individual tab to set the style

                ViewGroup.MarginLayoutParams marginLayoutParams =

                        (ViewGroup.MarginLayoutParams) tab.getLayoutParams();

                marginLayoutParams.setMargins(10, 20, 10, 20);

                int tabMarginSide = (int)mTabsContainer.getContext().getResources().

                    getDimension(R.dimen.profile_tab_margin_side);

                marginLayoutParams.setMargins(tabMarginSide, 0, tabMarginSide, 0);

                int tabHeightInDp = (int)mTabsContainer.getContext().getResources().

                    getDimension(R.dimen.tab_height);

                tab.getLayoutParams().height = tabHeightInDp;

                tab.requestLayout();

                tab.setBackgroundResource(R.drawable.tab_border_rounded);

            }