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

Commit abab4cbd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix floating toolbar menu item spacing." into pi-dev

parents 336076b2 49ec5425

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

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

                    .getDimensionPixelSize(R.dimen.floating_toolbar_height);

            mIconTextSpacing = context.getResources()

                    .getDimensionPixelSize(R.dimen.floating_toolbar_menu_button_side_padding);

                    .getDimensionPixelSize(R.dimen.floating_toolbar_icon_text_spacing);



            // Interpolators

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

            mOverflowButtonSize = measure(mOverflowButton);

            mMainPanel = createMainPanel();

            mOverflowPanelViewHelper = new OverflowPanelViewHelper(mContext);

            mOverflowPanelViewHelper = new OverflowPanelViewHelper(mContext, mIconTextSpacing);

            mOverflowPanel = createOverflowPanel();



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


            private final Context mContext;



            public OverflowPanelViewHelper(Context context) {

            public OverflowPanelViewHelper(Context context, int iconTextSpacing) {

                mContext = Preconditions.checkNotNull(context);

                mIconTextSpacing = context.getResources()

                        .getDimensionPixelSize(R.dimen.floating_toolbar_menu_button_side_padding);

                mIconTextSpacing = iconTextSpacing;

                mSidePadding = context.getResources()

                        .getDimensionPixelSize(R.dimen.floating_toolbar_overflow_side_padding);

                mCalculator = createMenuButton(null);

core/res/res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ 
    <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_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_side_padding">18dp</dimen>

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

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

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

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



    <!-- Magnifier dimensions -->

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

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2576,6 +2576,7 @@ 
  <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_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="drawable" name="ft_avd_tooverflow" />

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