diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-09-22 16:05:12 -0700 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2011-09-22 16:09:46 -0700 |
| commit | f632eaa9d64fb21892cc057ec7444ec157686734 (patch) | |
| tree | 21969d9a34ccce5646e7464f74dc78455dafc97e /core/java | |
| parent | 04ef5b8dd7262ee90b56df9c992f103695d0a21c (diff) | |
| download | frameworks_base-f632eaa9d64fb21892cc057ec7444ec157686734.zip frameworks_base-f632eaa9d64fb21892cc057ec7444ec157686734.tar.gz frameworks_base-f632eaa9d64fb21892cc057ec7444ec157686734.tar.bz2 | |
ActivityChooserView not showing "Show all" properly if the default target button not shown.
If the default target button is hidden all activities are shown in the list from
which to choose. In this case due to off by one error the list was not showing the
option to expand it if the activities are one more than the initially shown.
bug:5358475
Change-Id: I8c3db37dab008637d78330f8de830cec92720264
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/ActivityChooserView.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/widget/ActivityChooserView.java b/core/java/android/widget/ActivityChooserView.java index 25af3fa..26b0ae6 100644 --- a/core/java/android/widget/ActivityChooserView.java +++ b/core/java/android/widget/ActivityChooserView.java @@ -287,9 +287,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); @@ -297,8 +301,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 { |