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

Merge "ActivityChooserView shows "see all" improperly."

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-09-29 17:54:22 -07:00
committed by Android (Google) Code Review
parent 46c78b4de1 1c07e22c36
commit 2783b4fa43
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,8 +302,6 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
getViewTreeObserver().addOnGlobalLayoutListener(mOnGlobalLayoutListener); getViewTreeObserver().addOnGlobalLayoutListener(mOnGlobalLayoutListener);
mAdapter.setMaxActivityCount(maxActivityCount);
final boolean defaultActivityButtonShown = final boolean defaultActivityButtonShown =
mDefaultActivityButton.getVisibility() == VISIBLE; mDefaultActivityButton.getVisibility() == VISIBLE;
@@ -312,8 +310,10 @@ public class ActivityChooserView extends ViewGroup implements ActivityChooserMod
if (maxActivityCount != ActivityChooserViewAdapter.MAX_ACTIVITY_COUNT_UNLIMITED if (maxActivityCount != ActivityChooserViewAdapter.MAX_ACTIVITY_COUNT_UNLIMITED
&& activityCount > maxActivityCount + maxActivityCountOffset) { && activityCount > maxActivityCount + maxActivityCountOffset) {
mAdapter.setShowFooterView(true); mAdapter.setShowFooterView(true);
mAdapter.setMaxActivityCount(maxActivityCount - 1);
} else { } else {
mAdapter.setShowFooterView(false); mAdapter.setShowFooterView(false);
mAdapter.setMaxActivityCount(maxActivityCount);
} }
ListPopupWindow popupWindow = getListPopupWindow(); ListPopupWindow popupWindow = getListPopupWindow();