From 570383a54dd139602cd4705b7531779e45f19185 Mon Sep 17 00:00:00 2001 From: Arturo Mejia Date: Wed, 13 Jan 2021 11:56:20 -0500 Subject: [PATCH] Add dot notification for autoplay blocked content --- .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt | 4 ---- .../mozilla/fenix/components/toolbar/BrowserToolbarView.kt | 5 ++++- .../mozilla/fenix/components/toolbar/ToolbarIntegration.kt | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index b637d664f8..171fabf8f8 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -368,10 +368,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, showQuickSettingsDialog() } - browserToolbarView.view.display.setOnPermissionIndicatorClickedListener { - showQuickSettingsDialog() - } - browserToolbarView.view.display.setOnTrackingProtectionClickedListener { context.metrics.track(Event.TrackingProtectionIconPressed) showTrackingProtectionPanel() diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt index 97d103e6f6..fdad11b3b0 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt @@ -152,7 +152,10 @@ class BrowserToolbarView( hint = secondaryTextColor, separator = separatorColor, trackingProtection = primaryTextColor, - permissionHighlights = primaryTextColor + highlight = ContextCompat.getColor( + context, + R.color.whats_new_notification_color + ) ) display.hint = context.getString(R.string.search_hint) 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 4f19ee2ae0..ce93b611cf 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 @@ -130,7 +130,7 @@ class DefaultToolbarIntegration( } if (FeatureFlags.permissionIndicatorsToolbar) { - toolbar.display.indicators += DisplayToolbar.Indicators.PERMISSION_HIGHLIGHTS + toolbar.display.indicators += DisplayToolbar.Indicators.HIGHLIGHT } toolbar.display.displayIndicatorSeparator =