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

Commit 49ec5425 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki
Browse files

Fix floating toolbar menu item spacing. 

We mistakenly changed floating_toolbar_menu_button_side_padding in
I309c729eb842d9388066bfb43eb18f33dbfe10b8 where in fact what we
wanted to do was to just change the mIconTextSpacing.
This cl fixes that.

Change-Id: I1b940eb12d2948f8c167c3f37ed0eba105b9f5ce
Fixes: 74032743
Test: built, observed visual look
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
parent 519249f4

core/java/com/android/internal/widget/FloatingToolbar.java

+4 −5
Original line number Original line Diff line number Diff line
@@ -452,7 +452,7 @@ public final class FloatingToolbar { 
            mLineHeight = context.getResources()

            mLineHeight = context.getResources()

                    .getDimensionPixelSize(R.dimen.floating_toolbar_height);

                    .getDimensionPixelSize(R.dimen.floating_toolbar_height);

            mIconTextSpacing = context.getResources()

            mIconTextSpacing = context.getResources()

                    .getDimensionPixelSize(R.dimen.floating_toolbar_menu_button_side_padding);

                    .getDimensionPixelSize(R.dimen.floating_toolbar_icon_text_spacing);





            // Interpolators

            // Interpolators

            mLogAccelerateInterpolator = new LogAccelerateInterpolator();

            mLogAccelerateInterpolator = new LogAccelerateInterpolator();
@@ -481,7 +481,7 @@ public final class FloatingToolbar { 
            mOverflowButton = createOverflowButton();

            mOverflowButton = createOverflowButton();

            mOverflowButtonSize = measure(mOverflowButton);

            mOverflowButtonSize = measure(mOverflowButton);

            mMainPanel = createMainPanel();

            mMainPanel = createMainPanel();

            mOverflowPanelViewHelper = new OverflowPanelViewHelper(mContext);

            mOverflowPanelViewHelper = new OverflowPanelViewHelper(mContext, mIconTextSpacing);

            mOverflowPanel = createOverflowPanel();

            mOverflowPanel = createOverflowPanel();





            // Animation. Need views.

            // Animation. Need views.
@@ -1573,10 +1573,9 @@ public final class FloatingToolbar { 




            private final Context mContext;

            private final Context mContext;





            public OverflowPanelViewHelper(Context context) {

            public OverflowPanelViewHelper(Context context, int iconTextSpacing) {

                mContext = Preconditions.checkNotNull(context);

                mContext = Preconditions.checkNotNull(context);

                mIconTextSpacing = context.getResources()

                mIconTextSpacing = iconTextSpacing;

                        .getDimensionPixelSize(R.dimen.floating_toolbar_menu_button_side_padding);

                mSidePadding = context.getResources()

                mSidePadding = context.getResources()

                        .getDimensionPixelSize(R.dimen.floating_toolbar_overflow_side_padding);

                        .getDimensionPixelSize(R.dimen.floating_toolbar_overflow_side_padding);

                mCalculator = createMenuButton(null);

                mCalculator = createMenuButton(null);

core/res/res/values/dimens.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -536,7 +536,7 @@ 
    <dimen name="floating_toolbar_menu_image_width">24dp</dimen>

    <dimen name="floating_toolbar_menu_image_width">24dp</dimen>

    <dimen name="floating_toolbar_menu_image_button_width">56dp</dimen>

    <dimen name="floating_toolbar_menu_image_button_width">56dp</dimen>

    <dimen name="floating_toolbar_menu_image_button_vertical_padding">12dp</dimen>

    <dimen name="floating_toolbar_menu_image_button_vertical_padding">12dp</dimen>

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

    <dimen name="floating_toolbar_menu_button_side_padding">11dp</dimen>

    <dimen name="floating_toolbar_overflow_image_button_width">60dp</dimen>

    <dimen name="floating_toolbar_overflow_image_button_width">60dp</dimen>

    <dimen name="floating_toolbar_overflow_side_padding">18dp</dimen>

    <dimen name="floating_toolbar_overflow_side_padding">18dp</dimen>

    <dimen name="floating_toolbar_text_size">14sp</dimen>

    <dimen name="floating_toolbar_text_size">14sp</dimen>
@@ -547,6 +547,7 @@ 
    <dimen name="floating_toolbar_horizontal_margin">16dp</dimen>

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

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

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

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

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

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





    <!-- Magnifier dimensions -->

    <!-- Magnifier dimensions -->

    <dimen name="magnifier_width">100dp</dimen>

    <dimen name="magnifier_width">100dp</dimen>

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -2574,6 +2574,7 @@ 
  <java-symbol type="dimen" name="floating_toolbar_maximum_overflow_height" />

  <java-symbol type="dimen" name="floating_toolbar_maximum_overflow_height" />

  <java-symbol type="dimen" name="floating_toolbar_horizontal_margin" />

  <java-symbol type="dimen" name="floating_toolbar_horizontal_margin" />

  <java-symbol type="dimen" name="floating_toolbar_vertical_margin" />

  <java-symbol type="dimen" name="floating_toolbar_vertical_margin" />

  <java-symbol type="dimen" name="floating_toolbar_icon_text_spacing" />

  <java-symbol type="dimen" name="content_rect_bottom_clip_allowance" />

  <java-symbol type="dimen" name="content_rect_bottom_clip_allowance" />

  <java-symbol type="drawable" name="ft_avd_tooverflow" />

  <java-symbol type="drawable" name="ft_avd_tooverflow" />

  <java-symbol type="drawable" name="ft_avd_toarrow" />

  <java-symbol type="drawable" name="ft_avd_toarrow" />