From a2a8f1960d4ee2576eff35170508a88cb6b024ac Mon Sep 17 00:00:00 2001 From: Eric Kok Date: Mon, 23 Nov 2015 14:51:39 +0100 Subject: [PATCH] Fixed title in search screen (search query on larger screens, site selector only on smaller screens). Fixes #248. --- .../org/transdroid/core/gui/search/SearchActivity.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java b/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java index b00c6a26..97c13a05 100644 --- a/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java +++ b/app/src/main/java/org/transdroid/core/gui/search/SearchActivity.java @@ -142,6 +142,8 @@ public class SearchActivity extends AppCompatActivity { } } else { // Use the action bar spinner to select sites + if (getSupportActionBar() != null) + getSupportActionBar().setTitle(""); sitesSpinner.setVisibility(View.VISIBLE); sitesSpinner.setAdapter(new SearchSettingsDropDownAdapter(searchToolbar.getContext(), searchSites)); sitesSpinner.setOnItemSelectedListener(onSearchSiteSelected); @@ -293,9 +295,9 @@ public class SearchActivity extends AppCompatActivity { // Save the search site currently used to search for future usage applicationSettings.setLastUsedSearchSite(lastUsedSite); // Update the activity title (only shown on large devices) - if (sitesSpinner != null) - searchToolbar.setTitle( - NavigationHelper.buildCondensedFontString(getString(R.string.search_queryonsite, lastUsedQuery, lastUsedSite.getName()))); + if (sitesSpinner == null && getSupportActionBar() != null) + getSupportActionBar() + .setTitle(NavigationHelper.buildCondensedFontString(getString(R.string.search_queryonsite, lastUsedQuery, lastUsedSite.getName()))); // Ask the results fragment to start a search for the specified query fragmentResults.startSearch(lastUsedQuery, (SearchSite) lastUsedSite);