Bottom Navigation

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt

@@ -611,16 +611,18 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenBrowserNotShownAndOmnibarInputDoesNotHaveFocusThenPrivacyGradeIsNotShown() {
+    fun whenOmnibarDoesNotHaveFocusThenPrivacyGradeIsShownAndSearchIconIsHidden() {
         testee.onOmnibarInputStateChanged(query = "", hasFocus = false, hasQueryChanged = false)
-        assertFalse(browserViewState().showPrivacyGrade)
+        assertTrue(browserViewState().showPrivacyGrade)
+        assertFalse(browserViewState().showSearchIcon)
     }
 
     @Test
-    fun whenBrowserShownAndOmnibarInputDoesNotHaveFocusThenPrivacyGradeIsShown() {
+    fun whenBrowserShownAndOmnibarInputDoesNotHaveFocusThenPrivacyGradeIsShownAndSearchIconIsHidden() {
         testee.onUserSubmittedQuery("foo")
         testee.onOmnibarInputStateChanged(query = "", hasFocus = false, hasQueryChanged = false)
         assertTrue(browserViewState().showPrivacyGrade)
+        assertFalse(browserViewState().showSearchIcon)
     }
 
     @Test
@@ -630,10 +632,11 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenBrowserShownAndOmnibarInputHasFocusThenPrivacyGradeIsShown() {
+    fun whenBrowserShownAndOmnibarInputHasFocusThenSearchIconIsShownAndPrivacyGradeIsHidden() {
         testee.onUserSubmittedQuery("foo")
         testee.onOmnibarInputStateChanged("", true, hasQueryChanged = false)
-        assertTrue(browserViewState().showPrivacyGrade)
+        assertFalse(browserViewState().showPrivacyGrade)
+        assertTrue(browserViewState().showSearchIcon)
     }
 
     @Test

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

@@ -43,6 +43,23 @@ class VariantManagerTest {
         assertEquals(0, variant.features.size)
     }
 
+    // Bottom Bar Navigation Experiment
+
+    @Test
+    fun bottomBarNavigationControlVariantIsActiveAndHasNoFeatures() {
+        val variant = variants.first { it.key == "mm" }
+        assertEqualsDouble(1.0, variant.weight)
+        assertEquals(0, variant.features.size)
+    }
+
+    @Test
+    fun bottomBarNavigationVariantIsActiveAndHasBottomBarNavigationFeature() {
+        val variant = variants.first { it.key == "mn" }
+        assertEqualsDouble(1.0, variant.weight)
+        assertEquals(1, variant.features.size)
+        assertTrue(variant.hasFeature(BottomBarNavigation))
+    }
+
     @Test
     fun verifyNoDuplicateVariantNames() {
         val existingNames = mutableSetOf<String>()

app/src/main/AndroidManifest.xml

@@ -234,6 +234,10 @@
             android:name="com.duckduckgo.app.tabs.ui.TabSwitcherActivity"
             android:label="@string/tabActivityTitle" />
 
+        <activity
+            android:name="com.duckduckgo.app.tabs.ui.TabSwitcherBottomBarFeatureActivity"
+            android:label="@string/tabActivityTitle" />
+
         <activity
             android:name="com.duckduckgo.app.privacy.ui.PrivacyDashboardActivity"
             android:label="@string/privacyDashboardActivityTitle"

app/src/main/java/com/duckduckgo/app/about/AboutDuckDuckGoActivity.kt

@@ -31,19 +31,14 @@ class AboutDuckDuckGoActivity : DuckDuckGoActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_about_duck_duck_go)
-        configureActionBar()
+        setupToolbar(toolbar)
 
         learnMoreLink.setOnClickListener {
             startActivity(BrowserActivity.intent(this, Url.ABOUT))
             finish()
         }
     }
 
-    private fun configureActionBar() {
-        setSupportActionBar(toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-    }
-
     companion object {
         fun intent(context: Context): Intent {
             return Intent(context, AboutDuckDuckGoActivity::class.java)

app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt

@@ -59,7 +59,7 @@ class BookmarksActivity : DuckDuckGoActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_bookmarks)
-        setupActionBar()
+        setupToolbar(toolbar)
         setupBookmarksRecycler()
         observeViewModel()
     }
@@ -72,11 +72,6 @@ class BookmarksActivity : DuckDuckGoActivity() {
         recycler.addItemDecoration(separator)
     }
 
-    private fun setupActionBar() {
-        setSupportActionBar(toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-    }
-
     private fun observeViewModel() {
         viewModel.viewState.observe(this, Observer<BookmarksViewModel.ViewState> { viewState ->
             viewState?.let {

app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteActivity.kt

@@ -31,7 +31,6 @@ import kotlinx.android.synthetic.main.content_broken_sites.*
 import kotlinx.android.synthetic.main.include_toolbar.*
 import org.jetbrains.anko.longToast
 
-
 class BrokenSiteActivity : DuckDuckGoActivity() {
     private val viewModel: BrokenSiteViewModel by bindViewModel()
 
@@ -40,17 +39,12 @@ class BrokenSiteActivity : DuckDuckGoActivity() {
         setContentView(R.layout.activity_broken_site)
         configureListeners()
         configureObservers()
-        setupActionBar()
+        setupToolbar(toolbar)
         if (savedInstanceState == null) {
             consumeIntentExtra()
         }
     }
 
-    private fun setupActionBar() {
-        setSupportActionBar(toolbar)
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-    }
-
     private fun consumeIntentExtra() {
         val url = intent.getStringExtra(URL_EXTRA)
         val blockedTrackers = intent.getStringExtra(BLOCKED_TRACKERS_EXTRA)

app/src/main/java/com/duckduckgo/app/browser/BrowserPopupMenu.kt

@@ -24,15 +24,17 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.PopupWindow
+import com.duckduckgo.app.statistics.Variant
+import com.duckduckgo.app.statistics.VariantManager
 
-class BrowserPopupMenu : PopupWindow {
+class BrowserPopupMenu(layoutInflater: LayoutInflater, variant: Variant, view: View = inflate(layoutInflater, variant)) :
+    PopupWindow(view, WRAP_CONTENT, WRAP_CONTENT, true) {
 
-    constructor(layoutInflater: LayoutInflater, view: View = BrowserPopupMenu.inflate(layoutInflater))
-            : super(view, WRAP_CONTENT, WRAP_CONTENT, true) {
+    // popupwindow gets stuck on the screen on API 22 (tested on 23) without a background
+    // color.  Adding it however garbles the elevation so we cannot have elevation here.
 
+    init {
         if (SDK_INT <= 22) {
-            // popupwindow gets stuck on the screen on API 22 (tested on 23) without a background
-            // color.  Adding it however garbles the elevation so we cannot have elevation here.
             setBackgroundDrawable(ColorDrawable(Color.WHITE))
         } else {
             elevation = 6.toFloat()
@@ -59,10 +61,21 @@ class BrowserPopupMenu : PopupWindow {
 
         private const val margin = 30
 
-        fun inflate(layoutInflater: LayoutInflater): View {
+        fun inflate(layoutInflater: LayoutInflater, variant: Variant): View {
+            return if (variant.hasFeature(VariantManager.VariantFeature.BottomBarNavigation)) {
+                inflateBottomBarWithSearchFeature(layoutInflater)
+            } else {
+                inflateToolbarOnly(layoutInflater)
+            }
+        }
+
+        private fun inflateToolbarOnly(layoutInflater: LayoutInflater): View {
             return layoutInflater.inflate(R.layout.popup_window_browser_menu, null)
         }
 
+        private fun inflateBottomBarWithSearchFeature(layoutInflater: LayoutInflater): View {
+            return layoutInflater.inflate(R.layout.popup_window_browser_bottom_tab_menu, null)
+        }
     }
 }