1
0
Fork 0

For #12571: Rename 'Shortcuts' to 'Search engines'

Co-Authored-By: Khushraj Rathod <khushrajrathod@gmail.com>
master
Hakkı Kaan Çalışkan 2020-07-21 19:02:26 +03:00 committed by Jeff Boek
parent c2d940cf06
commit 2a0a11f740
4 changed files with 22 additions and 14 deletions

View File

@ -85,10 +85,10 @@ private fun assertShowSearchSuggestions() {
private fun assertShowSearchShortcuts() {
onView(withId(androidx.preference.R.id.recycler_view)).perform(
RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
hasDescendant(withText("Show search shortcuts"))
hasDescendant(withText("Show search engines"))
)
)
onView(withText("Show search shortcuts"))
onView(withText("Show search engines"))
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
}
@ -146,11 +146,11 @@ private fun toggleShowSearchSuggestions() {
private fun toggleShowSearchShortcuts() {
onView(withId(androidx.preference.R.id.recycler_view)).perform(
RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(
hasDescendant(withText("Show search shortcuts"))
hasDescendant(withText("Show search engines"))
)
)
onView(withText("Show search shortcuts"))
onView(withText("Show search engines"))
.perform(click())
}

View File

@ -147,7 +147,7 @@
android:layout_marginTop="@dimen/search_fragment_shortcuts_label_margin_vertical"
android:layout_marginEnd="@dimen/search_fragment_shortcuts_label_margin_horizontal"
android:visibility="gone"
android:text="@string/search_shortcuts_search_with_2"
android:text="@string/search_engines_search_with"
app:layout_constraintStart_toStartOf="@id/scrollable_area"
app:layout_constraintTop_toBottomOf="@id/awesomeBar_barrier"
tools:text="This time, search with:" />
@ -197,8 +197,8 @@
<ToggleButton
android:id="@+id/search_shortcuts_button"
style="@style/search_pill"
android:textOff="@string/search_shortcuts_button"
android:textOn="@string/search_shortcuts_button"
android:textOff="@string/search_engines_shortcut_button"
android:textOn="@string/search_engines_shortcut_button"
app:drawableStartCompat="@drawable/ic_search" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -146,13 +146,11 @@
<!-- Button in the search view that lets a user search by scanning a QR code -->
<string name="search_scan_button">Scan</string>
<!-- Button in the search view that lets a user search by using a shortcut -->
<string name="search_shortcuts_button">Shortcuts</string>
<string name="search_engines_shortcut_button">Search Engine</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>
<!-- 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>
<string name="search_engines_search_with">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 -->
@ -258,8 +256,8 @@
<string name="developer_tools_category">Developer tools</string>
<!-- Preference for developers -->
<string name="preferences_remote_debugging">Remote debugging via USB</string>
<!-- Preference title for switch preference to show search shortcuts -->
<string name="preferences_show_search_shortcuts">Show search shortcuts</string>
<!-- Preference title for switch preference to show search engines -->
<string name="preferences_show_search_engines">Show search engines</string>
<!-- Preference title for switch preference to show search suggestions -->
<string name="preferences_show_search_suggestions">Show search suggestions</string>
<!-- Preference title for switch preference to show voice search button -->
@ -1432,4 +1430,14 @@
<string name="top_sites_max_limit_content">To add a new top site, remove one. Long press the site and select remove.</string>
<!-- Confirmation dialog button text when top sites limit is reached. -->
<string name="top_sites_max_limit_confirmation_button">OK, Got It</string>
<!-- DEPRECATED STRINGS -->
<!-- Button in the search view that lets a user search by using a shortcut -->
<string name="search_shortcuts_button">Shortcuts</string>
<!-- 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>
<!-- Preference title for switch preference to show search shortcuts -->
<string name="preferences_show_search_shortcuts">Show search shortcuts</string>
</resources>

View File

@ -27,7 +27,7 @@
<SwitchPreference
android:defaultValue="true"
android:key="@string/pref_key_show_search_shortcuts"
android:title="@string/preferences_show_search_shortcuts" />
android:title="@string/preferences_show_search_engines" />
<SwitchPreference
android:defaultValue="true"
android:key="@string/pref_key_show_clipboard_suggestions"