commit ff92dd69af5d95c00ef6ce9285c97d3e937cd704
author Amith Yamasani <yamasani@google.com> Mon Nov 07 19:01:22 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 07 19:01:22 2011 +0000
tree bd7bcefc3ba1c9cd67352075e2f755986dfeab48
parent 48dd3880453d266405b8f0127551fc229726f7e6
parent 7919bfb12365b3f84e232235c35df957039995b7

am 7919bfb1: Merge "Don\'t show the submit button when it isn\'t enabled." into ics-mr1

* commit '7919bfb12365b3f84e232235c35df957039995b7':
  Don't show the submit button when it isn't enabled.

core/java/android/widget/SearchView.java

diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
index e84ae97..f524ef0 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -728,7 +728,8 @@
 
     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 @@
         CharSequence text = mQueryTextView.getText();
         mUserQuery = text;
         boolean hasText = !TextUtils.isEmpty(text);
-        if (isSubmitButtonEnabled()) {
-            updateSubmitButton(hasText);
-        }
+        updateSubmitButton(hasText);
         updateVoiceButton(!hasText);
         updateCloseButton();
         updateSubmitArea();