summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/ShareActionProvider.java
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2011-07-17 22:28:42 -0700
committerSvetoslav Ganov <svetoslavganov@google.com>2011-07-17 22:59:25 -0700
commit414051b8b1e31b69ca622d68f391245f1989500b (patch)
treede69f6dfdefb663dc935e76e82120d4dc90974c4 /core/java/android/widget/ShareActionProvider.java
parent4a49d9fe52a76c7f91f81113e0a8e9f97ac3f24c (diff)
downloadframeworks_base-414051b8b1e31b69ca622d68f391245f1989500b.zip
frameworks_base-414051b8b1e31b69ca622d68f391245f1989500b.tar.gz
frameworks_base-414051b8b1e31b69ca622d68f391245f1989500b.tar.bz2
Update the style of the action bar share UI
1. Made the background of the default and expand buttons change when pressed. 2. When the share UI is shown on the overflow the "Show all" menu item was present event if all items are shown. 3. The width of the popup for picking an item was different for the action view and overflow case. bug:5039747 Change-Id: I72afbcf86c93596c7eba4d70c002eab060ff31f8
Diffstat (limited to 'core/java/android/widget/ShareActionProvider.java')
-rw-r--r--core/java/android/widget/ShareActionProvider.java19
1 files changed, 11 insertions, 8 deletions
diff --git a/core/java/android/widget/ShareActionProvider.java b/core/java/android/widget/ShareActionProvider.java
index 2e0cc62..665109a 100644
--- a/core/java/android/widget/ShareActionProvider.java
+++ b/core/java/android/widget/ShareActionProvider.java
@@ -162,14 +162,17 @@ public class ShareActionProvider extends ActionProvider {
.setOnMenuItemClickListener(mOnMenuItemClickListener);
}
- // Add a sub-menu for showing all activities as a list item.
- SubMenu expandedSubMenu = subMenu.addSubMenu(Menu.NONE, collapsedActivityCount,
- collapsedActivityCount, mContext.getString(R.string.activity_chooser_view_see_all));
- for (int i = 0; i < expandedActivityCount; i++) {
- ResolveInfo activity = dataModel.getActivity(i);
- expandedSubMenu.add(0, i, i, activity.loadLabel(packageManager))
- .setIcon(activity.loadIcon(packageManager))
- .setOnMenuItemClickListener(mOnMenuItemClickListener);
+ if (collapsedActivityCount < expandedActivityCount) {
+ // Add a sub-menu for showing all activities as a list item.
+ SubMenu expandedSubMenu = subMenu.addSubMenu(Menu.NONE, collapsedActivityCount,
+ collapsedActivityCount,
+ mContext.getString(R.string.activity_chooser_view_see_all));
+ for (int i = 0; i < expandedActivityCount; i++) {
+ ResolveInfo activity = dataModel.getActivity(i);
+ expandedSubMenu.add(0, i, i, activity.loadLabel(packageManager))
+ .setIcon(activity.loadIcon(packageManager))
+ .setOnMenuItemClickListener(mOnMenuItemClickListener);
+ }
}
}