From 65fa904a21fcda85a4319b5b08d2f52e3ff4c7a1 Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Wed, 6 Mar 2019 11:48:09 -0800 Subject: [PATCH] No issue: remove breaking AC change params (#878) --- .../org/mozilla/fenix/components/toolbar/ToolbarMenu.kt | 8 -------- app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt | 3 --- 2 files changed, 11 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt index fef2cbfaa..2276a3447 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt @@ -68,7 +68,6 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_help), R.drawable.ic_help, - context.getString(R.string.browser_menu_help), DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) ) { onItemTapped.invoke(Item.Help) @@ -77,7 +76,6 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_settings), R.drawable.ic_settings, - context.getString(R.string.browser_menu_settings), DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) ) { onItemTapped.invoke(Item.Settings) @@ -86,7 +84,6 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_library), R.drawable.ic_library, - context.getString(R.string.browser_menu_library), DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) ) { onItemTapped.invoke(Item.Library) @@ -102,7 +99,6 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_find_in_page), R.drawable.mozac_ic_search, - context.getString(R.string.browser_menu_find_in_page), DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) ) { onItemTapped.invoke(Item.FindInPage) @@ -111,7 +107,6 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_private_tab), R.drawable.ic_private_browsing, - context.getString(R.string.browser_menu_private_tab), DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) ) { onItemTapped.invoke(Item.NewPrivateTab) @@ -120,7 +115,6 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_new_tab), R.drawable.ic_new, - context.getString(R.string.browser_menu_new_tab), DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) ) { onItemTapped.invoke(Item.NewTab) @@ -129,7 +123,6 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_share), R.drawable.mozac_ic_share, - context.getString(R.string.browser_menu_share), DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) ) { onItemTapped.invoke(Item.Share) @@ -138,7 +131,6 @@ class ToolbarMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_report_issue), R.drawable.ic_report_issues, - context.getString(R.string.browser_menu_report_issue), DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) ) { onItemTapped.invoke(Item.ReportIssue) diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt index 6a159b8b8..af9d34cfb 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt @@ -28,7 +28,6 @@ class HomeMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_settings), R.drawable.ic_settings, - context.getString(R.string.browser_menu_settings), DefaultThemeManager.resolveAttribute(R.attr.iconColor, context) ) { onItemTapped.invoke(HomeMenu.Item.Settings) @@ -37,7 +36,6 @@ class HomeMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_library), R.drawable.ic_library, - context.getString(R.string.browser_menu_library), DefaultThemeManager.resolveAttribute(R.attr.iconColor, context) ) { onItemTapped.invoke(HomeMenu.Item.Library) @@ -47,7 +45,6 @@ class HomeMenu( BrowserMenuImageText( context.getString(R.string.browser_menu_help), R.drawable.ic_help, - context.getString(R.string.browser_menu_help), DefaultThemeManager.resolveAttribute(R.attr.iconColor, context) ) { onItemTapped.invoke(HomeMenu.Item.Help)