commit 475593e249c53a8dc43f9cd43f528867c6a4074b
author Amith Yamasani <yamasani@google.com> Tue Dec 07 08:49:50 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 07 08:49:51 2010 -0800
tree af1a5867b082afc636541c74cd6f8e21395ad6fc
parent dc09b5ae896fcef3e862411cf6a0208d8ff9988a
parent acd8d2d2e7b36c9fb34c2981623d19247fa63860

Merge "Prevent SearchView dropdown from showing up when SearchView is hidden."

core/java/android/widget/SearchView.java

diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
index b32bd42..e499e54 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -1271,7 +1271,7 @@
         public void onWindowFocusChanged(boolean hasWindowFocus) {
             super.onWindowFocusChanged(hasWindowFocus);
 
-            if (hasWindowFocus) {
+            if (hasWindowFocus && mSearchView.hasFocus() && getVisibility() == VISIBLE) {
                 InputMethodManager inputManager = (InputMethodManager) getContext()
                         .getSystemService(Context.INPUT_METHOD_SERVICE);
                 inputManager.showSoftInput(this, 0);