commit db120c4dd21bc53c6f58d0140e3a9a3dc6e79b16
author Svetoslav Ganov <svetoslavganov@google.com> Wed May 23 16:12:15 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 23 16:12:15 2012 -0700
tree c6ce044ecc209a3f69ab179b74f94b528a05ab8b
parent 425f126a0f2284423f4ccea0b00fbd5ea670a6c9
parent 1de7af86d720accda08df4c5bcf0b55da90f9208

am 1de7af86: am a587b890: Merge "ActivityChooser view not handling its removal and relayout properly." into jb-dev

* commit '1de7af86d720accda08df4c5bcf0b55da90f9208':
  ActivityChooser view not handling its removal and relayout properly.

core/java/android/widget/ActivityChooserView.java

diff --git a/core/java/android/widget/ActivityChooserView.java b/core/java/android/widget/ActivityChooserView.java
index be6b4e2..4eb169b 100644
--- a/core/java/android/widget/ActivityChooserView.java
+++ b/core/java/android/widget/ActivityChooserView.java
@@ -400,6 +400,9 @@
         if (viewTreeObserver.isAlive()) {
             viewTreeObserver.removeOnGlobalLayoutListener(mOnGlobalLayoutListener);
         }
+        if (isShowingPopup()) {
+            dismissPopup();
+        }
         mIsAttachedToWindow = false;
     }
 
@@ -420,9 +423,7 @@
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         mActivityChooserContent.layout(0, 0, right - left, bottom - top);
-        if (getListPopupWindow().isShowing()) {
-            showPopupUnchecked(mAdapter.getMaxActivityCount());
-        } else {
+        if (!isShowingPopup()) {
             dismissPopup();
         }
     }