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

Commit 2a00f980 authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev
Browse files

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

The presence of a tooltip (specifically, long click detection
logic required by it) interferes with touch processing in
AbsListView.

Bug: 35726766
Test: android.cts.widget.PopupTest#testItemViewAttributes
Change-Id: Ida49c07e5f2e3e06f5994f2cc4aa10ef112376d0
parent 0c6d24f7

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