From 6f5e934b96c400f610b1c5ad228cc60cab5d443f Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Thu, 27 Jan 2011 13:30:55 -0800
Subject: [PATCH] Fix bug 3391818 - Keyboard covers the "Show in chat list"
 selection in talk > Friend Info

Make spinner dropdowns cover the IME if present without being touched
first.

Change-Id: Ie47df1ad684649de73b102e2ecf5528a35301d93
---
 core/java/android/widget/ListPopupWindow.java | 2 +-
 core/java/android/widget/Spinner.java         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/widget/ListPopupWindow.java b/core/java/android/widget/ListPopupWindow.java
index 5dc42e44ae9f5..8116a1237112c 100644
--- a/core/java/android/widget/ListPopupWindow.java
+++ b/core/java/android/widget/ListPopupWindow.java
@@ -190,6 +190,7 @@ public class ListPopupWindow {
     public ListPopupWindow(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         mContext = context;
         mPopup = new PopupWindow(context, attrs, defStyleAttr, defStyleRes);
+        mPopup.setInputMethodMode(PopupWindow.INPUT_METHOD_NEEDED);
     }
 
     /**
@@ -576,7 +577,6 @@ public class ListPopupWindow {
             }
 
             mPopup.setWindowLayoutMode(widthSpec, heightSpec);
-            mPopup.setInputMethodMode(PopupWindow.INPUT_METHOD_NEEDED);
             mPopup.setClipToScreenEnabled(true);
             
             // use outside touchable to dismiss drop down when touching outside of it, so
diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java
index 0baddcb975011..a92272ce1ce47 100644
--- a/core/java/android/widget/Spinner.java
+++ b/core/java/android/widget/Spinner.java
@@ -665,6 +665,7 @@ public class Spinner extends AbsSpinner implements OnClickListener {
         @Override
         public void show() {
             setWidth(Spinner.this.getWidth());
+            setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
             super.show();
             getListView().setChoiceMode(ListView.CHOICE_MODE_SINGLE);
             setSelection(Spinner.this.getSelectedItemPosition());