Merge branch 'SearchFix' into 'develop'

Search fix

See merge request 
This commit is contained in:
birdbird 2023-04-10 11:08:04 +00:00
commit 297f71a8c8
3 changed files with 2 additions and 14 deletions
ultrasonic/src/main/res

@ -2,19 +2,8 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
a:orientation="vertical">
<com.google.android.material.search.SearchView
a:layout_width="match_parent"
a:layout_height="match_parent"
a:hint="@string/search.title"
app:layout_anchor="@id/search_bar">
<!-- Search suggestions/results go here (ScrollView, RecyclerView, etc.). -->
<include layout="@layout/list_parts_empty_view" />
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@ -30,6 +19,5 @@
a:layout_weight="1.0" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</com.google.android.material.search.SearchView>
</LinearLayout>

@ -447,7 +447,7 @@
<string name="settings.five_star_rating_title">Use five star rating for songs</string>
<string name="settings.five_star_rating_description">Use five star rating system for songs instead of simply starring/unstarring items.</string>
<string name="settings.use_hw_offload_title">Use hardware playback (experimental)</string>
<string name="settings.use_hw_offload_description">Try to play the media using the media decoder chip on your phone. This can improve battery usage.</string>
<string name="settings.use_hw_offload_description">Try to play the media using the media decoder chip on your phone. This can improve battery usage. Some users report glitches in playback when they activate this option!</string>
<string name="list_view">List</string>
<string name="grid_view">Cover</string>
<string name="supported_server_features">Supported features</string>

@ -5,6 +5,6 @@
a:voiceSearchMode="showVoiceSearchButton|launchRecognizer"
a:queryAfterZeroResults="true"
a:voiceLanguageModel="web_search"
a:searchSuggestAuthority="org.moire.ultrasonic.provider.SearchSuggestionProvider"
a:searchSuggestAuthority="${applicationId}.provider.SearchSuggestionProvider"
a:searchSuggestSelection=" ?" >
</searchable>