Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-09-22 19:08:26 -07:00
committed by Android (Google) Code Review
parent 1dc43b5cc5 f632eaa9d6
commit 1ac6b1e221
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/ActivityChooserView.java
View File

@@ -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 {