8000 Feature/remove tab ux experiment (#611) · androiddev2019/Android@8a9337c · GitHub
[go: up one dir, main page]
Skip to content

Commit 8a9337c

Browse files
CDRussellCDRussell
authored
Feature/remove tab ux experiment (duckduckgo#611)
* Remove tab experimental code and old implementation * Remove tests surrounding the tab experimental variants * Remove unnecessary string and asset
1 parent 049bc3e commit 8a9337c

File tree

37 files changed

+2
-709
lines changed

37 files changed

+2
-709
lines changed

‎app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,31 +37,6 @@ class VariantManagerTest {
3737
assertEquals(0, variant.features.size)
3838
}
3939

40-
@Test
41-
fun tabUxExperimentVariantActive() {
42-
val variant = variants.firstOrNull { it.key == "mx" }
43-
assertEqualsDouble(1.0, variant!!.weight)
44-
}
45-
46-
@Test
47-
fun tabUxExperimentVariantHasExperimentalFeatureForGridTabSwitcher() {
48-
val variant = variants.firstOrNull { it.key == "mx" }
49-
assertEquals(1, variant!!.features.size)
50-
assertTrue(variant.hasFeature(VariantManager.VariantFeature.TabSwitcherGrid))
51-
}
52-
53-
@Test
54-
fun tabUxControlGroupVariantActive() {
55-
val variant = variants.firstOrNull { it.key == "mw" }
56-
assertEqualsDouble(1.0, variant!!.weight)
57-
}
58-
59-
@Test
60-
fun tabUxControlGroupVariantHasNoExperimentFeatures() {
61-
val variant = variants.firstOrNull { it.key == "mw" }
62-
assertEquals(0, variant!!.features.size)
63-
}
64-
6540
@Test
6641
fun defaultBrowserDialogExperimentVariantActive() {
6742
val variant = variants.firstOrNull { it.key == "mo" }

‎app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,6 @@
104104
</intent-filter>
105105
</activity>
106106

107-
<activity
108-
android:name="com.duckduckgo.app.tabs.ui.old.TabSwitcherActivityLegacy"
109-
android:label="@string/tabActivityTitle" />
110-
111107
<activity
112108
android:name="com.duckduckgo.app.tabs.ui.TabSwitcherActivity"
113109
android:label="@string/tabActivityTitle" />

‎app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ import com.duckduckgo.app.survey.model.Survey
8787
import com.duckduckgo.app.survey.ui.SurveyActivity
8888
import com.duckduckgo.app.tabs.model.TabEntity
8989
import com.duckduckgo.app.tabs.ui.TabSwitcherActivity
90-
import com.duckduckgo.app.tabs.ui.old.TabSwitcherActivityLegacy
9190
import com.duckduckgo.app.widget.ui.AddWidgetInstructionsActivity
9291
import com.duckduckgo.widget.SearchWidgetLight
9392
import com.google.android.material.snackbar.Snackbar
@@ -254,18 +253,12 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
254253
@OnLifecycleEvent(Lifecycle.Event.ON_STOP)
255254
fun onStop() {
256255
if (isVisible) {
257-
userLeavingBrowserScreen()
256+
updateOrDeleteWebViewPreview()
258257
}
259258
}
260259
})
261260
}
262261

263-
fun userLeavingBrowserScreen() {
264-
if (variantManager.getVariant().hasFeature(VariantManager.VariantFeature.TabSwitcherGrid)) {
265-
updateOrDeleteWebViewPreview()
266-
}
267-
}
268-
269262
private fun updateOrDeleteWebViewPreview() {
270263
val url = viewModel.url
271264
Timber.d("Updating or deleting WebView preview for $url")
@@ -289,11 +282,6 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
289282
}
290283
}
291284

292-
private fun launchTabSwitcherLegacy() {
293-
val activity = activity ?: return
294-
startActivity(TabSwitcherActivityLegacy.intent(activity))
295-
}
296-
297285
private fun launchTabSwitcher() {
298286
val activity = activity ?: return
299287
startActivity(TabSwitcherActivity.intent(activity, tabId))
@@ -491,7 +479,6 @@ class BrowserTabFragment : Fragment(), FindListener, CoroutineScope {
491479
is Command.SaveCredentials -> saveBasicAuthCredentials(it.request, it.credentials)
492480
is Command.GenerateWebViewPreviewImage -> generateWebViewPreviewImage()
493481
is Command.LaunchTabSwitcher -> launchTabSwitcher()
494-
is Command.LaunchTabSwitcherLegacy -> launchTabSwitcherLegacy()
495482
}
496483
}
497484

‎app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ import com.duckduckgo.app.privacy.db.NetworkLeaderboardDao
6161
import com.duckduckgo.app.privacy.model.PrivacyGrade
6262
import com.duckduckgo.app.settings.db.SettingsDataStore
6363
import com.duckduckgo.app.statistics.VariantManager
64-
import com.duckduckgo.app.statistics.VariantManager.VariantFeature.TabSwitcherGrid
6564
import com.duckduckgo.app.statistics.api.StatisticsUpdater
6665
import com.duckduckgo.app.statistics.pixels.Pixel
6766
import com.duckduckgo.app.statistics.pixels.Pixel.PixelName
@@ -183,7 +182,6 @@ class BrowserTabViewModel(
183182
class SaveCredentials(val request: BasicAuthenticationRequest, val credentials: BasicAuthenticationCredentials) : Command()
184183
object GenerateWebViewPreviewImage : Command()
185184
object LaunchTabSwitcher : Command()
186-
object LaunchTabSwitcherLegacy : Command()
187185
}
188186

189187
val autoCompleteViewState: MutableLiveData<AutoCompleteViewState> = MutableLiveData()
@@ -855,10 +853,6 @@ class BrowserTabViewModel(
855853
}
856854

857855
fun userLaunchingTabSwitcher() {
858-
if (variantManager.getVariant().hasFeature(TabSwitcherGrid)) {
859-
command.value = LaunchTabSwitcher
860-
} else {
861-
command.value = LaunchTabSwitcherLegacy
862-
}
856+
command.value = LaunchTabSwitcher
863857
}
864858
}

‎app/src/main/java/com/duckduckgo/app/di/AndroidBindingModule.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import com.duckduckgo.app.privacy.ui.TrackerNetworksActivity
4646
import com.duckduckgo.app.settings.SettingsActivity
4747
import com.duckduckgo.app.survey.ui.SurveyActivity
4848
import com.duckduckgo.app.tabs.ui.TabSwitcherActivity
49-
import com.duckduckgo.app.tabs.ui.old.TabSwitcherActivityLegacy
5049
import com.duckduckgo.app.widget.ui.AddWidgetInstructionsActivity
5150
import dagger.Module
5251
import dagger.android.ContributesAndroidInjector
@@ -73,10 +72,6 @@ abstract class AndroidBindingModule {
7372
@ContributesAndroidInjector
7473
abstract fun tabsActivity(): TabSwitcherActivity
7574

76-
@ActivityScoped
77-
@ContributesAndroidInjector
78-
abstract fun tabsActivityLegacy(): TabSwitcherActivityLegacy
79-
8075
@ActivityScoped
8176
@ContributesAndroidInjector
8277
abstract fun privacyDashboardActivity(): PrivacyDashboardActivity

‎app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ interface VariantManager {
2828

2929
sealed class VariantFeature {
3030
// variant-dependant features listed here
31-
object TabSwitcherGrid : VariantFeature()
3231

3332
object OnboardingExperiment : VariantFeature()
3433
}
@@ -46,8 +45,6 @@ interface VariantManager {
4645
Variant(key = "se", weight = 0.0, features = emptyList(), filterBy = { noFilter() }),
4746

4847
// All groups in an experiment (control and variants) MUST use the same filters
49-
Variant(key = "mw", weight = 1.0, features = emptyList(), filterBy = { noFilter() }),
50-
Variant(key = "mx", weight = 1.0, features = listOf(VariantFeature.TabSwitcherGrid), filterBy = { noFilter() }),
5148

5249
Variant(key = "mp", weight = 1.0, features = emptyList(), filterBy = { isEnglishLocale() && apiIsNougatOrAbove() && isNotHuawei() }),
5350
Variant(

‎app/src/main/java/com/duckduckgo/app/tabs/ui/old/TabSwitcherActivityLegacy.kt

Lines changed: 0 additions & 163 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0