From 4fb26a06017187086bbf03e185a42381dacaf74e Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Fri, 6 Dec 2019 10:36:19 -0800
Subject: [PATCH] For #4664 - Updates search_with string. (#6909)

---
 .../java/org/mozilla/fenix/ui/robots/SearchRobot.kt           | 2 +-
 app/src/main/res/layout/fragment_search.xml                   | 4 ++--
 app/src/main/res/values/strings.xml                           | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
index e610f8bb5..c970a8c74 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
@@ -146,7 +146,7 @@ private fun assertScanButton() =
         .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
 
 private fun assertSearchWithText() =
-    onView(allOf(withText("SEARCH WITH")))
+    onView(allOf(withText("THIS TIME, SEARCH WITH:")))
         .check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
 
 private fun assertSearchSettings() =
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 67a683b2c..ed934a8fe 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -125,10 +125,10 @@
         android:layout_marginStart="@dimen/search_fragment_shortcuts_label_margin_horizontal"
         android:layout_marginTop="@dimen/search_fragment_shortcuts_label_margin_vertical"
         android:layout_marginEnd="@dimen/search_fragment_shortcuts_label_margin_horizontal"
-        android:text="@string/search_shortcuts_search_with"
+        android:text="@string/search_shortcuts_search_with_2"
         app:layout_constraintStart_toStartOf="@id/toolbar_wrapper"
         app:layout_constraintTop_toBottomOf="@id/awesomeBar_barrier"
-        tools:text="Search with" />
+        tools:text="This time, search with:" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/awesomeBar_barrier"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9ce6eda1f..a2a4ae72e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -113,8 +113,10 @@
     <string name="search_shortcuts_button">Shortcuts</string>
     <!-- Button in the search view when shortcuts are displayed that takes a user to the search engine settings -->
     <string name="search_shortcuts_engine_settings">Search engine settings</string>
-    <!-- Header displayed when selecting a shortcut search engine -->
+    <!-- DEPRECATED: Header displayed when selecting a shortcut search engine -->
     <string name="search_shortcuts_search_with">Search with</string>
+    <!-- Header displayed when selecting a shortcut search engine -->
+    <string name="search_shortcuts_search_with_2">This time, search with:</string>
     <!-- Button in the search view that lets a user navigate to the site in their clipboard -->
     <string name="awesomebar_clipboard_title">Fill link from clipboard</string>
     <!-- Button in the search suggestions onboarding that allows search suggestions in private sessions -->