Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'search-clear-focus' into 'master'

Browse Source 
Search: clear focus when enter/return is pressed

Fixes #572.

Assigning to @pserwylo since he wrote the current search widget stuff.

See merge request !206
This commit is contained in:
Peter Serwylo 2016-02-16 11:06:21 +00:00
commit e892d55b91
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
F-Droid/src/org/fdroid/fdroid/FDroid.java
View File

@ -69,6 +69,8 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
private FDroidApp fdroidApp; private FDroidApp fdroidApp;
private SearchView searchView;
private ViewPager viewPager; private ViewPager viewPager;
@Nullable @Nullable
@ -288,7 +290,7 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE); SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
searchMenuItem = menu.findItem(R.id.action_search); searchMenuItem = menu.findItem(R.id.action_search);
SearchView searchView = (SearchView) MenuItemCompat.getActionView(searchMenuItem); searchView = (SearchView) MenuItemCompat.getActionView(searchMenuItem);
searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName())); searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
// LayoutParams.MATCH_PARENT does not work, use a big value instead // LayoutParams.MATCH_PARENT does not work, use a big value instead
searchView.setMaxWidth(1000000); searchView.setMaxWidth(1000000);
@ -418,8 +420,7 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
@Override @Override
public boolean onQueryTextSubmit(String query) { public boolean onQueryTextSubmit(String query) {
// Do nothing, because we respond to the query being changed as it is updated searchView.clearFocus();
// via onQueryTextChange(...)
return true; return true;
} }