mirror of
https://github.com/MatomoCamp/matomocamp-companion-android.git
synced 2024-09-19 16:13:46 +02:00
Fixed search view gaining focus when going back to SearchResultActivity
in pre-ICS ActionBar.
This commit is contained in:
parent
e21b4de047
commit
6a4d86a42f
1 changed files with 10 additions and 7 deletions
|
@ -68,12 +68,7 @@ public class SearchResultActivity extends ActionBarActivity {
|
|||
|
||||
currentQuery = query;
|
||||
if (searchView != null) {
|
||||
// Force loosing the focus to prevent the suggestions from appearing
|
||||
searchView.clearFocus();
|
||||
searchView.setFocusable(false);
|
||||
searchView.setFocusableInTouchMode(false);
|
||||
|
||||
searchView.setQuery(query, false);
|
||||
setSearchViewQuery(query);
|
||||
}
|
||||
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.FROYO) {
|
||||
|
@ -107,7 +102,7 @@ public class SearchResultActivity extends ActionBarActivity {
|
|||
searchView = (SearchView) MenuItemCompat.getActionView(searchMenuItem);
|
||||
searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
|
||||
searchView.setIconifiedByDefault(false); // Always show the search view
|
||||
searchView.setQuery(currentQuery, false);
|
||||
setSearchViewQuery(currentQuery);
|
||||
} else {
|
||||
// Legacy search mode for Eclair
|
||||
MenuItemCompat.setActionView(searchMenuItem, null);
|
||||
|
@ -116,6 +111,14 @@ public class SearchResultActivity extends ActionBarActivity {
|
|||
return true;
|
||||
}
|
||||
|
||||
private void setSearchViewQuery(String query) {
|
||||
// Force loosing the focus to prevent the suggestions from appearing
|
||||
searchView.clearFocus();
|
||||
searchView.setFocusable(false);
|
||||
searchView.setFocusableInTouchMode(false);
|
||||
searchView.setQuery(query, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
|
|
Loading…
Reference in a new issue