Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug 5358705 - Request no full-screen mode of the IME when a SearchView is expanded in an action bar"

Browse Source
This commit is contained in:
Adam Powell
2011-09-25 14:45:59 -07:00
committed by Android (Google) Code Review
parent c52feae948 53f56c4f51
commit 83131db9a8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/SearchView.java
View File

@@ -120,6 +120,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
private CharSequence mOldQueryText; private CharSequence mOldQueryText;
private CharSequence mUserQuery; private CharSequence mUserQuery;
private boolean mExpandedInActionView; private boolean mExpandedInActionView;
private int mCollapsedImeOptions;
private SearchableInfo mSearchable; private SearchableInfo mSearchable;
private Bundle mAppSearchData; private Bundle mAppSearchData;
@@ -1166,6 +1167,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
clearFocus(); clearFocus();
updateViewsVisibility(true); updateViewsVisibility(true);
mQueryTextView.setText(""); mQueryTextView.setText("");
mQueryTextView.setImeOptions(mCollapsedImeOptions);
mExpandedInActionView = false; mExpandedInActionView = false;
} }
@@ -1175,6 +1177,8 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
@Override @Override
public void onActionViewExpanded() { public void onActionViewExpanded() {
mExpandedInActionView = true; mExpandedInActionView = true;
mCollapsedImeOptions = mQueryTextView.getImeOptions();
mQueryTextView.setImeOptions(mCollapsedImeOptions | EditorInfo.IME_FLAG_NO_FULLSCREEN);
setIconified(false); setIconified(false);
} }