From f3b7ab829b685e327367fbe6f880ba7f034ac7f2 Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Mon, 29 Apr 2019 09:56:07 -0700 Subject: [PATCH] [fenix] Revert "For https://github.com/mozilla-mobile/fenix/issues/1751 - Add Delete Button to Private Toolbar" This reverts commit a416b398e9dd04f032515ed55995a9b4b36a0547. --- .../components/toolbar/ToolbarIntegration.kt | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt index 0a596d9a3b..494133428e 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt @@ -5,8 +5,6 @@ package org.mozilla.fenix.components.toolbar import android.content.Context -import android.graphics.PorterDuff -import androidx.core.content.ContextCompat import androidx.navigation.Navigation import mozilla.components.browser.domains.autocomplete.DomainAutocompleteProvider import mozilla.components.browser.session.SessionManager @@ -50,30 +48,6 @@ class ToolbarIntegration( return@run } - if (isPrivate) { - val deleteIcon = context.getDrawable(R.drawable.ic_delete) - deleteIcon?.setColorFilter( - ContextCompat.getColor( - context, - DefaultThemeManager.resolveAttribute(R.attr.primaryText, context) - ), PorterDuff.Mode.SRC_IN - ) - deleteIcon?.let { - val deleteSessions = BrowserToolbar.Button( - deleteIcon, - context.getString(R.string.private_browsing_delete_session), - listener = { - context.components.useCases.tabsUseCases.removeAllTabsOfType.invoke( - private = true - ) - Navigation.findNavController(toolbar) - .navigate(BrowserFragmentDirections.actionBrowserFragmentToHomeFragment()) - } - ) - toolbar.addNavigationAction(deleteSessions) - } - } - val tabsAction = TabCounterToolbarButton( sessionManager, {