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

1 files changed, 1 insertions, 1 deletions

diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
index b32bd42a8d9a..e499e54a7328 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -1271,7 +1271,7 @@ public class SearchView extends LinearLayout {
         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);