From c0673aa7a022973407c74421902845cf9715d011 Mon Sep 17 00:00:00 2001 From: Ramasamy Gopalan Date: Mon, 18 Aug 2014 16:44:45 -0400 Subject: [PATCH] Bug 1052026 - Add content description when creating action button in GeckoActionProvider. r=wesj --- mobile/android/base/menu/MenuItemActionView.java | 3 ++- mobile/android/base/widget/GeckoActionProvider.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/menu/MenuItemActionView.java b/mobile/android/base/menu/MenuItemActionView.java index 2463aaee700c..c8238d82ac4c 100644 --- a/mobile/android/base/menu/MenuItemActionView.java +++ b/mobile/android/base/menu/MenuItemActionView.java @@ -135,7 +135,7 @@ public class MenuItemActionView extends LinearLayout mMenuItem.setSubMenuIndicator(hasSubMenu); } - public void addActionButton(Drawable drawable) { + public void addActionButton(Drawable drawable, CharSequence label) { // If this is the first icon, retain the text. // If not, make the menu item an icon. final int count = mActionButtons.size(); @@ -145,6 +145,7 @@ public class MenuItemActionView extends LinearLayout if (drawable != null) { ImageButton button = new ImageButton(getContext(), null, R.attr.menuItemShareActionButtonStyle); button.setImageDrawable(drawable); + button.setContentDescription(label); button.setOnClickListener(this); button.setTag(count); diff --git a/mobile/android/base/widget/GeckoActionProvider.java b/mobile/android/base/widget/GeckoActionProvider.java index 1cef3acc0fdf..6361be4bdc0d 100644 --- a/mobile/android/base/widget/GeckoActionProvider.java +++ b/mobile/android/base/widget/GeckoActionProvider.java @@ -105,7 +105,8 @@ public class GeckoActionProvider { } for (int i = 0; i < historySize; i++) { - view.addActionButton(dataModel.getActivity(i).loadIcon(packageManager)); + view.addActionButton(dataModel.getActivity(i).loadIcon(packageManager), + dataModel.getActivity(i).loadLabel(packageManager)); } return view;