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

Commit 1ac6b1e2 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "ActivityChooserView not showing "Show all" properly if the default target button not shown."

parents 1dc43b5c f632eaa9

core/java/android/widget/ActivityChooserView.java

+5 −3
Original line number Diff line number Diff line
@@ -304,9 +304,13 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod 


        mAdapter.setMaxActivityCount(maxActivityCount);



        final boolean defaultActivityButtonShown =

            mDefaultActivityButton.getVisibility() == VISIBLE;



        final int activityCount = mAdapter.getActivityCount();

        final int maxActivityCountOffset = defaultActivityButtonShown ? 1 : 0;

        if (maxActivityCount != ActivityChooserViewAdapter.MAX_ACTIVITY_COUNT_UNLIMITED

                && activityCount > maxActivityCount + 1) {

                && activityCount > maxActivityCount + maxActivityCountOffset) {

            mAdapter.setShowFooterView(true);

        } else {

            mAdapter.setShowFooterView(false);
@@ -314,8 +318,6 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod 


        ListPopupWindow popupWindow = getListPopupWindow();

        if (!popupWindow.isShowing()) {

            final boolean defaultActivityButtonShown =

                mDefaultActivityButton.getVisibility() == VISIBLE;

            if (mIsSelectingDefaultActivity || !defaultActivityButtonShown) {

                mAdapter.setShowDefaultActivity(true, defaultActivityButtonShown);

            } else {