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

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

Merge "ActivityChooserView shows "see all" improperly."

parents 46c78b4d 1c07e22c

core/java/android/widget/ActivityChooserView.java

+2 −2
Original line number Diff line number Diff line
@@ -302,8 +302,6 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod 


        getViewTreeObserver().addOnGlobalLayoutListener(mOnGlobalLayoutListener);



        mAdapter.setMaxActivityCount(maxActivityCount);



        final boolean defaultActivityButtonShown =

            mDefaultActivityButton.getVisibility() == VISIBLE;
@@ -312,8 +310,10 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod 
        if (maxActivityCount != ActivityChooserViewAdapter.MAX_ACTIVITY_COUNT_UNLIMITED

                && activityCount > maxActivityCount + maxActivityCountOffset) {

            mAdapter.setShowFooterView(true);

            mAdapter.setMaxActivityCount(maxActivityCount - 1);

        } else {

            mAdapter.setShowFooterView(false);

            mAdapter.setMaxActivityCount(maxActivityCount);

        }



        ListPopupWindow popupWindow = getListPopupWindow();