diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-11-11 00:00:02 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-11 00:00:02 -0800 |
| commit | 7b8bec280f20e8a5863d8214bbc195497335eba6 (patch) | |
| tree | 5108b89edca15e5c75a28ae4922a3a3350163bea /core | |
| parent | 30f03ac650f2ffaafe9cc49942a4a8a7858dbd88 (diff) | |
| parent | 06f938e8aa56cd89ab0bdb04c8b946392c428dd1 (diff) | |
| download | frameworks_base-7b8bec280f20e8a5863d8214bbc195497335eba6.zip frameworks_base-7b8bec280f20e8a5863d8214bbc195497335eba6.tar.gz frameworks_base-7b8bec280f20e8a5863d8214bbc195497335eba6.tar.bz2 | |
Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/PopupWindow.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index 8ba7bee..5fa4ad0 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -1248,6 +1248,8 @@ public class PopupWindow { */ public void dismiss() { if (isShowing() && mPopupView != null) { + mIsShowing = false; + unregisterForScrollChanged(); try { @@ -1257,7 +1259,6 @@ public class PopupWindow { ((ViewGroup) mPopupView).removeView(mContentView); } mPopupView = null; - mIsShowing = false; if (mOnDismissListener != null) { mOnDismissListener.onDismiss(); |