Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: abab4cbd25

Change-Id: I2c1ea1a59df0ac97d202b42550604dd8d1687cbd
This commit is contained in:
Abodunrinwa Toki
2018-04-25 13:28:42 -07:00
committed by android-build-merger
parent 226abf5f0b abab4cbd25
commit cb9873dba9
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/widget/FloatingToolbar.java
View File

@@ -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);

3
core/res/res/values/dimens.xml
View File

@@ -531,7 +531,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>
@@ -542,6 +542,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>

1
core/res/res/values/symbols.xml
View File

@@ -2576,6 +2576,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" />