drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some bugs with MenuPopupHelper and ListPopupWindow

Browse Source 
Clean up handling of a few conditions in MenuPopupHelper that the
monkeys manage to trigger around the use of ViewTreeObserver. (bug
3443819, bug 3312949)

Fix a bug where a stale handler message could cause a ListPopupWindow
to reopen itself after being dismissed. (bug 3453607)

Change-Id: I488014767ccee785500862a2572beb35901d173b
This commit is contained in:
Adam Powell
2011-02-14 19:54:29 -08:00
parent 95d6b782a2
commit ca51e8788a
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/widget/ListPopupWindow.java
View File

@ -604,6 +604,7 @@ public class ListPopupWindow {
removePromptView();
mPopup.setContentView(null);
mDropDownList = null;
mHandler.removeCallbacks(mResizePopupRunnable);
}
/**

22
core/java/com/android/internal/view/menu/MenuPopupHelper.java
View File

@ -101,8 +101,10 @@ public class MenuPopupHelper implements AdapterView.OnItemClickListener, View.On
}
if (anchor != null) {
mTreeObserver = anchor.getViewTreeObserver();
mTreeObserver.addOnGlobalLayoutListener(this);
if (mTreeObserver == null) {
mTreeObserver = anchor.getViewTreeObserver();
mTreeObserver.addOnGlobalLayoutListener(this);
}
mPopup.setAnchorView(anchor);
} else {
return false;
@ -123,10 +125,10 @@ public class MenuPopupHelper implements AdapterView.OnItemClickListener, View.On
public void onDismiss() {
mPopup = null;
if (mTreeObserver != null) {
mTreeObserver.removeGlobalOnLayoutListener(MenuPopupHelper.this);
mTreeObserver = null;
if (mTreeObserver != null && mTreeObserver.isAlive()) {
mTreeObserver.removeGlobalOnLayoutListener(this);
}
mTreeObserver = null;
}
public boolean isShowing() {
@ -134,6 +136,8 @@ public class MenuPopupHelper implements AdapterView.OnItemClickListener, View.On
}
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (!isShowing()) return;
MenuItem item = null;
if (mOverflowOnly) {
item = mMenu.getOverflowItem(position);
@ -184,13 +188,15 @@ public class MenuPopupHelper implements AdapterView.OnItemClickListener, View.On
@Override
public void onGlobalLayout() {
if (!isShowing()) {
mTreeObserver.removeGlobalOnLayoutListener(this);
if (mTreeObserver.isAlive()) {
mTreeObserver.removeGlobalOnLayoutListener(this);
}
mTreeObserver = null;
} else {
final View anchor = mAnchorView != null ? mAnchorView.get() : null;
if (anchor != null && !anchor.isShown()) {
if (anchor == null || !anchor.isShown()) {
dismiss();
} else {
} else if (isShowing()) {
// Recompute window size and position
mPopup.show();
}