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

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

Merge "Do not set tooltips on items in list-based menus."

parents d77ae2b0 2a00f980

core/java/com/android/internal/view/menu/ListMenuItemView.java

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ public class ListMenuItemView extends LinearLayout implements MenuView.ItemView 
        setEnabled(itemData.isEnabled());

        setSubMenuArrowVisible(itemData.hasSubMenu());

        setContentDescription(itemData.getContentDescription());

        setTooltipText(itemData.getTooltipText());

    }



    public void setForceShowIcon(boolean forceShow) {

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

+2 −1
Original line number Diff line number Diff line
@@ -1195,6 +1195,8 @@ public final class FloatingToolbar { 
                    }



                    setButtonTagAndClickListener(menuItemButton, menuItem);

                    // Set tooltips for main panel items, but not overflow items (b/35726766).

                    menuItemButton.setTooltipText(menuItem.getTooltipText());

                    mMainPanel.addView(menuItemButton);

                    final ViewGroup.LayoutParams params = menuItemButton.getLayoutParams();

                    params.width = menuItemButtonWidth + extraPadding / 2;
@@ -1635,7 +1637,6 @@ public final class FloatingToolbar { 
                buttonText.setPaddingRelative(iconTextSpacing, 0, 0, 0);

            }

        }

        menuItemButton.setTooltipText(menuItem.getTooltipText());

        final CharSequence contentDescription = menuItem.getContentDescription();

        if (TextUtils.isEmpty(contentDescription)) {

            menuItemButton.setContentDescription(menuItem.getTitle());