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

Merge "ActivityChooser view not handling its removal and relayout properly." into jb-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-05-23 16:06:47 -07:00
committed by Android (Google) Code Review
parent df3633b389 748ee2e82a
commit a587b890bb
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/widget/ActivityChooserView.java
View File

@ -400,6 +400,9 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
if (viewTreeObserver.isAlive()) { if (viewTreeObserver.isAlive()) {
viewTreeObserver.removeOnGlobalLayoutListener(mOnGlobalLayoutListener); viewTreeObserver.removeOnGlobalLayoutListener(mOnGlobalLayoutListener);
} }
if (isShowingPopup()) {
dismissPopup();
}
mIsAttachedToWindow = false; mIsAttachedToWindow = false;
} }
@ -420,9 +423,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
@Override @Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) { protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
mActivityChooserContent.layout(0, 0, right - left, bottom - top); mActivityChooserContent.layout(0, 0, right - left, bottom - top);
if (getListPopupWindow().isShowing()) { if (!isShowingPopup()) {
showPopupUnchecked(mAdapter.getMaxActivityCount());
} else {
dismissPopup(); dismissPopup();
} }
} }