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

Merge "Don't show the submit button when it isn't enabled." into ics-mr1

Browse Source
This commit is contained in:
Amith Yamasani
2011-11-07 10:57:17 -08:00
committed by Android (Google) Code Review
parent 19c86cacb2 cf72ab4dde
commit 7919bfb123
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -728,7 +728,8 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
private void updateSubmitButton(boolean hasText) {
int visibility = GONE;
if (isSubmitAreaEnabled() && hasFocus() && (hasText || !mVoiceButtonEnabled)) {
if (mSubmitButtonEnabled && isSubmitAreaEnabled() && hasFocus()
&& (hasText || !mVoiceButtonEnabled)) {
visibility = VISIBLE;
}
mSubmitButton.setVisibility(visibility);
@@ -1082,9 +1083,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
CharSequence text = mQueryTextView.getText();
mUserQuery = text;
boolean hasText = !TextUtils.isEmpty(text);
if (isSubmitButtonEnabled()) {
updateSubmitButton(hasText);
}
updateSubmitButton(hasText);
updateVoiceButton(!hasText);
updateCloseButton();
updateSubmitArea();