Merge "ActivityChooserView shows "see all" improperly."

Author: sganov

core/java/android/widget/ActivityChooserView.java

@@ -302,8 +302,6 @@ private void showPopupUnchecked(int maxActivityCount) {
 
         getViewTreeObserver().addOnGlobalLayoutListener(mOnGlobalLayoutListener);
 
-        mAdapter.setMaxActivityCount(maxActivityCount);
-
         final boolean defaultActivityButtonShown =
             mDefaultActivityButton.getVisibility() == VISIBLE;
 
@@ -312,8 +310,10 @@ private void showPopupUnchecked(int maxActivityCount) {
         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();