From 45e3f7805b98452c04e5b1f2a63d3a055152099b Mon Sep 17 00:00:00 2001
From: Shen <guoshen714@yahoo.com>
Date: Tue, 4 Aug 2020 21:51:02 -0700
Subject: [PATCH] For #13168 - Removed the close button from history navigation
 bar

---
 .../java/org/mozilla/fenix/ui/HistoryTest.kt  | 10 --------
 .../mozilla/fenix/ui/robots/HistoryRobot.kt   | 11 ---------
 .../fenix/library/history/HistoryFragment.kt  | 24 ++++++-------------
 3 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
index 19464c018..19f97ddcb 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/HistoryTest.kt
@@ -340,14 +340,4 @@ class HistoryTest {
             verifyShareTabUrl()
         }
     }
-
-    @Test
-    fun verifyCloseMenu() {
-        homeScreen {
-        }.openThreeDotMenu {
-        }.openHistory {
-        }.closeMenu {
-            verifyHomeScreen()
-        }
-    }
 }
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt
index 72d62ec06..60a96e96d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt
@@ -84,16 +84,7 @@ class HistoryRobot {
     fun verifyDeleteSnackbarText(text: String) = assertSnackBarText(text)
 
     class Transition {
-        fun closeMenu(interact: HistoryRobot.() -> Unit): Transition {
-            closeButton().click()
-
-            HistoryRobot().interact()
-            return Transition()
-        }
-
         fun goBackToBrowser(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
-            closeButton().click()
-
             BrowserRobot().interact()
             return BrowserRobot.Transition()
         }
@@ -114,8 +105,6 @@ fun historyMenu(interact: HistoryRobot.() -> Unit): HistoryRobot.Transition {
     return HistoryRobot.Transition()
 }
 
-private fun closeButton() = onView(withId(R.id.close_history))
-
 private fun testPageTitle() = onView(allOf(withId(R.id.title), withText("Test_Page_1")))
 
 private fun pageUrl() = onView(withId(R.id.url))
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
index ee4f50180..7f2d49db6 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
@@ -161,27 +161,17 @@ class HistoryFragment : LibraryPageFragment<HistoryItem>(), UserInteractionHandl
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        val menuRes = when (historyStore.state.mode) {
-            HistoryFragmentState.Mode.Normal -> R.menu.library_menu
-            is HistoryFragmentState.Mode.Syncing -> R.menu.library_menu
-            is HistoryFragmentState.Mode.Editing -> R.menu.history_select_multi
+        if (historyStore.state.mode is HistoryFragmentState.Mode.Editing) {
+            inflater.inflate(R.menu.history_select_multi, menu)
+            menu.findItem(R.id.share_history_multi_select)?.isVisible = true
+            menu.findItem(R.id.delete_history_multi_select)?.title =
+                SpannableString(getString(R.string.bookmark_menu_delete_button)).apply {
+                    setTextColor(requireContext(), R.attr.destructive)
+                }
         }
-
-        inflater.inflate(menuRes, menu)
-
-        menu.findItem(R.id.share_history_multi_select)?.isVisible = true
-
-        menu.findItem(R.id.delete_history_multi_select)?.title =
-            SpannableString(getString(R.string.bookmark_menu_delete_button)).apply {
-                setTextColor(requireContext(), R.attr.destructive)
-            }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
-        R.id.close_history -> {
-            close()
-            true
-        }
         R.id.share_history_multi_select -> {
             val selectedHistory = historyStore.state.mode.selectedItems
             val shareTabs = selectedHistory.map { ShareData(url = it.url, title = it.title) }