From c3ed7a55c0faae453f91f3a7c3c3cc2496acc0fb Mon Sep 17 00:00:00 2001 From: Michael Comella Date: Thu, 19 Nov 2015 09:57:21 -0800 Subject: [PATCH] Bug 1140210 - Fix build errors after rebase. r=me --HG-- extra : commitid : EInQJfzClsE extra : rebase_source : 53dac9bb8aaa299e7c150440c97b5a7b32e02864 --- mobile/android/base/menu/GeckoMenu.java | 4 ++-- mobile/android/base/menu/QuickShareBarActionView.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mobile/android/base/menu/GeckoMenu.java b/mobile/android/base/menu/GeckoMenu.java index 8df8a71681b6..5b1dcd543edf 100644 --- a/mobile/android/base/menu/GeckoMenu.java +++ b/mobile/android/base/menu/GeckoMenu.java @@ -228,8 +228,8 @@ public class GeckoMenu extends ListView mItems.add(menuItem); } } else if (actionEnum == GeckoMenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW) { - if (actionView instanceof MenuItemActionView) { - final MenuItemActionView quickShareView = (MenuItemActionView) actionView; + if (actionView instanceof MenuItemSwitcherLayout) { + final MenuItemSwitcherLayout quickShareView = (MenuItemSwitcherLayout) actionView; // We don't want to add the quick share bar if we don't have any quick share items. if (quickShareView.getActionButtonCount() > 0 && diff --git a/mobile/android/base/menu/QuickShareBarActionView.java b/mobile/android/base/menu/QuickShareBarActionView.java index 934dd1e39ab4..077c30b35a18 100644 --- a/mobile/android/base/menu/QuickShareBarActionView.java +++ b/mobile/android/base/menu/QuickShareBarActionView.java @@ -19,10 +19,10 @@ import org.mozilla.gecko.R; * uplifted, and this implementation will soon be replaced with the old implementation for adding * the share plane to the menu (see https://bug1122302.bugzilla.mozilla.org/attachment.cgi?id=8572126). */ -public class QuickShareBarActionView extends MenuItemActionView { +public class QuickShareBarActionView extends MenuItemSwitcherLayout { public QuickShareBarActionView(Context context, AttributeSet attrs) { - this(context, attrs, R.attr.menuItemActionViewStyle); + this(context, attrs, R.attr.menuItemSwitcherLayoutStyle); } @TargetApi(14)