From 93c64038829f4df4932dfcdfaf87302c5d4b56b8 Mon Sep 17 00:00:00 2001 From: mcarare Date: Mon, 10 May 2021 12:42:03 +0300 Subject: [PATCH] For #19357: Remove bookmarks experiment and keep star-with-line icon. --- .../mozilla/fenix/experiments/Experiments.kt | 1 - .../java/org/mozilla/fenix/home/HomeMenu.kt | 17 ++--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt b/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt index b6f5ac4cb..92808c5ff 100644 --- a/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt +++ b/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt @@ -7,7 +7,6 @@ package org.mozilla.fenix.experiments class Experiments { companion object { const val A_A_NIMBUS_VALIDATION = "fenix-nimbus-validation-v3" - const val BOOKMARK_ICON = "fenix-bookmark-list-icon" const val ANDROID_KEYSTORE = "fenix-android-keystore" const val DEFAULT_BROWSER = "fenix-default-browser" } 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 4c22f21d8..cf89bd2bb 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt @@ -133,17 +133,10 @@ class HomeMenu( ) { onItemTapped.invoke(Item.WhatsNew) } - val experiments = context.components.analytics.experiments - val bookmarksIcon = experiments.withExperiment(Experiments.BOOKMARK_ICON) { - when (it) { - ExperimentBranch.TREATMENT -> R.drawable.ic_bookmark_list - else -> R.drawable.ic_bookmark_filled - } - } val bookmarksItem = BrowserMenuImageText( context.getString(R.string.library_bookmarks), - bookmarksIcon, + R.drawable.ic_bookmark_list, primaryTextColor ) { onItemTapped.invoke(Item.Bookmarks) @@ -251,15 +244,9 @@ class HomeMenu( val experiments = context.components.analytics.experiments val settings = context.components.settings - val bookmarksIcon = experiments.withExperiment(Experiments.BOOKMARK_ICON) { - when (it) { - ExperimentBranch.TREATMENT -> R.drawable.ic_bookmark_list - else -> R.drawable.ic_bookmark_filled - } - } val bookmarksItem = BrowserMenuImageText( context.getString(R.string.library_bookmarks), - bookmarksIcon, + R.drawable.ic_bookmark_list, primaryTextColor ) { onItemTapped.invoke(Item.Bookmarks)