diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-09-22 19:08:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-22 19:08:26 -0700 |
| commit | 1ac6b1e221a76d7f09f47599449227e934d61d83 (patch) | |
| tree | 3dfe38ddc2178d4ceb4894cc7cb2fb617966b12d /core/java/android/widget | |
| parent | 1dc43b5cc5d37d3bd2a8dcd689d32e219f44d2fe (diff) | |
| parent | f632eaa9d64fb21892cc057ec7444ec157686734 (diff) | |
| download | frameworks_base-1ac6b1e221a76d7f09f47599449227e934d61d83.zip frameworks_base-1ac6b1e221a76d7f09f47599449227e934d61d83.tar.gz frameworks_base-1ac6b1e221a76d7f09f47599449227e934d61d83.tar.bz2 | |
Merge "ActivityChooserView not showing "Show all" properly if the default target button not shown."
Diffstat (limited to 'core/java/android/widget')
| -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 5841283..c6e63c3 100644 --- a/core/java/android/widget/ActivityChooserView.java +++ b/core/java/android/widget/ActivityChooserView.java @@ -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 { |