blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #4664 - Updates search_with string. (#6909)

master
Jeff Boek 2019-12-06 10:36:19 -08:00 committed by Severin Rudie
parent 9feb0480bf
commit 4fb26a0601
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
View File

@ -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() =

4
app/src/main/res/layout/fragment_search.xml
View File

@ -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"

4
app/src/main/res/values/strings.xml
View File

@ -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 -->