Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1de7af86 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am a587b890: Merge "ActivityChooser view not handling its removal and relayout... 

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

* commit 'a587b890':
  ActivityChooser view not handling its removal and relayout properly.
parents a865d7d7 a587b890

core/java/android/widget/ActivityChooserView.java

+4 −3
Original line number Diff line number Diff line
@@ -400,6 +400,9 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod 
        if (viewTreeObserver.isAlive()) {

            viewTreeObserver.removeOnGlobalLayoutListener(mOnGlobalLayoutListener);

        }

        if (isShowingPopup()) {

            dismissPopup();

        }

        mIsAttachedToWindow = false;

    }
@@ -420,9 +423,7 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod 
    @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();

        }

    }