blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #1744: Open search shortcuts when entering search mode (#4536)

master
Yeon Taek Jeong 2019-08-05 15:07:03 -07:00 committed by GitHub
parent 6f7ae227a8
commit 6f962d3376
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/HomeActivity.kt
View File

@ -196,7 +196,7 @@ open class HomeActivity : AppCompatActivity(), ShareFragment.TabsSharedCallback
return return
} else if (intent?.extras?.getBoolean(OPEN_TO_SEARCH) == true) { } else if (intent?.extras?.getBoolean(OPEN_TO_SEARCH) == true) {
this.intent.putExtra(OPEN_TO_SEARCH, false) this.intent.putExtra(OPEN_TO_SEARCH, false)
navHost.navController.nav(null, NavGraphDirections.actionGlobalSearch(null, true)) navHost.navController.nav(null, NavGraphDirections.actionGlobalSearch(null))
return return
} }

7
app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
View File

@ -65,11 +65,6 @@ class SearchFragment : Fragment(), BackHandler {
?.let { it.sessionId } ?.let { it.sessionId }
?.let(requireComponents.core.sessionManager::findSessionById) ?.let(requireComponents.core.sessionManager::findSessionById)
val displaySearchShortcuts = arguments
?.let(SearchFragmentArgs.Companion::fromBundle)
?.let { it.displaySearchShortcuts }
?: false
val view = inflater.inflate(R.layout.fragment_search, container, false) val view = inflater.inflate(R.layout.fragment_search, container, false)
val url = session?.url ?: "" val url = session?.url ?: ""
@ -77,7 +72,7 @@ class SearchFragment : Fragment(), BackHandler {
SearchStore( SearchStore(
SearchState( SearchState(
query = url, query = url,
showShortcutEnginePicker = displaySearchShortcuts, showShortcutEnginePicker = true,
searchEngineSource = SearchEngineSource.Default( searchEngineSource = SearchEngineSource.Default(
requireComponents.search.searchEngineManager.getDefaultSearchEngine(requireContext()) requireComponents.search.searchEngineManager.getDefaultSearchEngine(requireContext())
), ),

5
app/src/main/res/navigation/nav_graph.xml
View File

@ -72,11 +72,6 @@
android:name="session_id" android:name="session_id"
app:argType="string" app:argType="string"
app:nullable="true" /> app:nullable="true" />
<argument
android:name="displaySearchShortcuts"
android:defaultValue="false"
app:argType="boolean"
app:nullable="false" />
<action <action
android:id="@+id/action_searchFragment_to_searchEngineFragment" android:id="@+id/action_searchFragment_to_searchEngineFragment"
app:destination="@id/searchEngineFragment" app:destination="@id/searchEngineFragment"