From 68f209b91b6d9979a3cfd4c1f5f292869b7272ea Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 3 Jan 2021 11:08:23 -0500 Subject: [PATCH] Replace global search context menu option with share target (cherry picked from commit d11c72fd48150f792050fb6f689d0be3a0a672c7) # Conflicts: # app/src/main/res/values/strings.xml --- app/src/main/AndroidManifest.xml | 4 ++-- app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 4 ++-- app/src/main/res/values/strings.xml | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 23dcf8430..125976607 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,7 @@ android:name=".ui.main.DeepLinkActivity" android:launchMode="singleTask" android:theme="@android:style/Theme.NoDisplay" - android:label="@string/process_text_action_name"> + android:label="@string/action_global_search"> @@ -55,7 +55,7 @@ - + diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index efeb8126d..6562b96ce 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -306,12 +306,12 @@ class MainActivity : BaseViewBindingActivity() { setSelectedNavItem(R.id.nav_more) router.pushController(RouterTransaction.with(DownloadController())) } - Intent.ACTION_SEARCH, Intent.ACTION_PROCESS_TEXT, "com.google.android.gms.actions.SEARCH_ACTION" -> { + Intent.ACTION_SEARCH, Intent.ACTION_SEND, "com.google.android.gms.actions.SEARCH_ACTION" -> { // If the intent match the "standard" Android search intent // or the Google-specific search intent (triggered by saying or typing "search *query* on *Tachiyomi*" in Google Search/Google Assistant) // Get the search query provided in extras, and if not null, perform a global search with it. - val query = intent.getStringExtra(SearchManager.QUERY) ?: intent.getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT)?.toString() + val query = intent.getStringExtra(SearchManager.QUERY) ?: intent.getStringExtra(Intent.EXTRA_TEXT) if (query != null && query.isNotEmpty()) { if (router.backstackSize > 1) { router.popToRoot() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6892367de..2c3d2e60f 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -738,7 +738,4 @@ Previous page Next page - - Search in TachiyomiSY -