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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-25 03:41:12 +00:00
committed by Android (Google) Code Review
parent d77ae2b0ac 2a00f9807c
commit 313fd5f345
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/com/android/internal/view/menu/ListMenuItemView.java
View File

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

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

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