From 8c1a64a5e869679d5b05c02a533378e75f326f42 Mon Sep 17 00:00:00 2001
From: Noah Bond <nbond@mozilla.com>
Date: Thu, 7 Oct 2021 14:56:14 -0700
Subject: [PATCH] For #21773 - Updated "customize homepage" button to go to the
 new Homepage submenu in Settings

---
 app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt   | 2 +-
 .../fenix/home/sessioncontrol/SessionControlController.kt  | 2 +-
 app/src/main/res/navigation/nav_graph.xml                  | 7 ++-----
 .../fenix/home/DefaultSessionControlControllerTest.kt      | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 70d635b00..324ee750a 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -881,7 +881,7 @@ class HomeFragment : Fragment() {
                         hideOnboardingIfNeeded()
                         nav(
                             R.id.homeFragment,
-                            HomeFragmentDirections.actionGlobalCustomizationFragment()
+                            HomeFragmentDirections.actionGlobalHomeSettingsFragment()
                         )
                     }
                     is HomeMenu.Item.SyncAccount -> {
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
index 9b956a3dd..edbb31bc5 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
@@ -449,7 +449,7 @@ class DefaultSessionControlController(
     }
 
     override fun handleCustomizeHomeTapped() {
-        val directions = HomeFragmentDirections.actionGlobalCustomizationFragment()
+        val directions = HomeFragmentDirections.actionGlobalHomeSettingsFragment()
         navController.nav(R.id.homeFragment, directions)
         metrics.track(Event.HomeScreenCustomizedHomeClicked)
     }
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index f77ac80df..e0a1173c7 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -67,8 +67,8 @@
         android:id="@+id/action_global_settingsFragment"
         app:destination="@id/settingsFragment" />
     <action
-        android:id="@+id/action_global_customizationFragment"
-        app:destination="@id/customizationFragment" />
+        android:id="@+id/action_global_homeSettingsFragment"
+        app:destination="@id/homeSettingsFragment" />
     <action
         android:id="@+id/action_global_privateBrowsingFragment"
         app:destination="@id/privateBrowsingFragment" />
@@ -215,9 +215,6 @@
         <action
             android:id="@+id/action_browserFragment_to_settingsFragment"
             app:destination="@id/settingsFragment" />
-        <action
-            android:id="@+id/action_browserFragment_to_customFragment"
-            app:destination="@id/customizationFragment" />
         <action
             android:id="@+id/action_browserFragment_to_createShortcutFragment"
             app:destination="@id/createShortcutFragment" />
diff --git a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
index e82204ccc..408bfd935 100644
--- a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
@@ -170,7 +170,7 @@ class DefaultSessionControlControllerTest {
         verify {
             navController.navigate(
                 match<NavDirections> {
-                    it.actionId == R.id.action_global_customizationFragment
+                    it.actionId == R.id.action_global_homeSettingsFragment
                 },
                 null
             )