From 5fb100debd30cb55ef02cd2fa22db5e801c0edc4 Mon Sep 17 00:00:00 2001
From: Colin Lee <mncolinlee@gmail.com>
Date: Tue, 4 Jun 2019 10:08:06 -0500
Subject: [PATCH] For #1966: Up button should cancel multi-selection first
 (#3108)

---
 app/src/main/java/org/mozilla/fenix/HomeActivity.kt   |  3 +++
 .../main/res/layout/toolbar_selected_bookmarks.xml    | 11 -----------
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 app/src/main/res/layout/toolbar_selected_bookmarks.xml

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 1b0eef124..3ae991901 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -71,6 +71,9 @@ open class HomeActivity : AppCompatActivity() {
         val navigationToolbar = findViewById<Toolbar>(R.id.navigationToolbar)
         setSupportActionBar(navigationToolbar)
         NavigationUI.setupWithNavController(navigationToolbar, navHost.navController, appBarConfiguration)
+        navigationToolbar.setNavigationOnClickListener {
+            onBackPressed()
+        }
         supportActionBar?.hide()
 
         intent
diff --git a/app/src/main/res/layout/toolbar_selected_bookmarks.xml b/app/src/main/res/layout/toolbar_selected_bookmarks.xml
deleted file mode 100644
index 5d4c83511..000000000
--- a/app/src/main/res/layout/toolbar_selected_bookmarks.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/selectionToolbar"
-    android:layout_width="match_parent"
-    android:layout_height="56dp"
-    app:titleMarginStart="16dp"
-    app:titleMarginEnd="16dp"
-    app:titleTextAppearance="@style/ToolbarTitleTextStyle"
-    android:background="?foundation"
-    android:elevation="8dp"/>
\ No newline at end of file