From f7bda73985e67133f814a8e8a81fcacce5160849 Mon Sep 17 00:00:00 2001
From: Craig Russell <craig.russell.1986@gmail.com>
Date: Fri, 31 Aug 2018 16:37:30 +0100
Subject: [PATCH] Add new items to the Tab Switcher's overflow menu

---
 .../com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt  |  8 +++++++-
 app/src/main/res/menu/menu_tab_switcher_activity.xml   | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt
index 088902d31c17..4379dcc37ad4 100644
--- a/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt
@@ -29,6 +29,7 @@ import com.duckduckgo.app.global.DuckDuckGoActivity
 import com.duckduckgo.app.global.ViewModelFactory
 import com.duckduckgo.app.global.view.ClearPersonalDataAction
 import com.duckduckgo.app.global.view.FireDialog
+import com.duckduckgo.app.settings.SettingsActivity
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.tabs.model.TabEntity
 import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command
@@ -104,8 +105,9 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherAdapter.TabSwitched
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.fire -> onFire()
-            R.id.newTab -> onNewTabRequested()
+            R.id.newTab, R.id.newTabOverflow -> onNewTabRequested()
             R.id.closeAllTabs -> closeAllTabs()
+            R.id.settings -> showSettings()
         }
         return super.onOptionsItemSelected(item)
     }
@@ -135,6 +137,10 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherAdapter.TabSwitched
         }
     }
 
+    private fun showSettings() {
+        startActivity(SettingsActivity.intent(this))
+    }
+
     override fun finish() {
         clearObserversEarlyToStopViewUpdates()
         super.finish()
diff --git a/app/src/main/res/menu/menu_tab_switcher_activity.xml b/app/src/main/res/menu/menu_tab_switcher_activity.xml
index a2108cbb2f39..1b605ac5747f 100644
--- a/app/src/main/res/menu/menu_tab_switcher_activity.xml
+++ b/app/src/main/res/menu/menu_tab_switcher_activity.xml
@@ -31,9 +31,19 @@
         android:title="@string/newTabMenuItem"
         app:showAsAction="always" />
 
+    <item
+        android:id="@+id/newTabOverflow"
+        android:title="@string/newTabMenuItem"
+        app:showAsAction="never" />
+
     <item
         android:id="@+id/closeAllTabs"
         android:title="@string/closeAllTabsMenuItem"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/settings"
+        android:title="@string/settingsMenuItemTitle"
+        app:showAsAction="never" />
+
 </menu>