commit 43d7b83ed92d54eeaf81e8e8b554daee1741df7b
author Adam Powell <adamp@google.com> Thu Jan 27 13:53:03 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 27 13:53:03 2011 -0800
tree cbd7d8cf2b1682b526bb0db7e74c9cc4ecefe043
parent 6f7a6bc3454fce5cfb86a0fc6a37022d24d1e465
parent 6f5e934b96c400f610b1c5ad228cc60cab5d443f

Merge "Fix bug 3391818 - Keyboard covers the "Show in chat list" selection in talk > Friend Info" into honeycomb

core/java/android/widget/ListPopupWindow.java

diff --git a/core/java/android/widget/ListPopupWindow.java b/core/java/android/widget/ListPopupWindow.java
index 5dc42e4..8116a12 100644
--- a/core/java/android/widget/ListPopupWindow.java
+++ b/core/java/android/widget/ListPopupWindow.java
@@ -190,6 +190,7 @@
     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 @@
             }
 
             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

core/java/android/widget/Spinner.java

diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java
index 0baddcb..a92272c 100644
--- a/core/java/android/widget/Spinner.java
+++ b/core/java/android/widget/Spinner.java
@@ -665,6 +665,7 @@
         @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());