summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-01-27 13:30:55 -0800
committerAdam Powell <adamp@google.com>2011-01-27 13:30:55 -0800
commit6f5e934b96c400f610b1c5ad228cc60cab5d443f (patch)
tree0faac30115490e4252e017f5ce848f5a2e9b60f3 /core/java
parent315f3865983f59e5ad9f42602f443e8c42b6e5c4 (diff)
downloadframeworks_base-6f5e934b96c400f610b1c5ad228cc60cab5d443f.zip
frameworks_base-6f5e934b96c400f610b1c5ad228cc60cab5d443f.tar.gz
frameworks_base-6f5e934b96c400f610b1c5ad228cc60cab5d443f.tar.bz2
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
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/widget/ListPopupWindow.java2
-rw-r--r--core/java/android/widget/Spinner.java1
2 files changed, 2 insertions, 1 deletions
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 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 0baddcb..a92272c 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());