diff options
| author | Patrick Dubroy <dubroy@google.com> | 2010-10-25 18:00:59 -0700 |
|---|---|---|
| committer | Patrick Dubroy <dubroy@google.com> | 2010-10-25 18:01:07 -0700 |
| commit | b3c81cc83c3c375933d35e82eea84e212a2e87ef (patch) | |
| tree | 7c65a62445d135c21e4d077028963a9b56e54ebf /src/com | |
| parent | 7fcaf0e75c08f5ae2c10d444e5010a73d66dac2c (diff) | |
| download | android_packages_apps_Trebuchet-b3c81cc83c3c375933d35e82eea84e212a2e87ef.tar.gz android_packages_apps_Trebuchet-b3c81cc83c3c375933d35e82eea84e212a2e87ef.tar.bz2 android_packages_apps_Trebuchet-b3c81cc83c3c375933d35e82eea84e212a2e87ef.zip | |
Re-enable clicking on CAB buttons
Change-Id: I7ac99fb1b90aad2816e371b8d4b363b7ddae057c
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher2/AllAppsPagedView.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/com/android/launcher2/AllAppsPagedView.java b/src/com/android/launcher2/AllAppsPagedView.java index 54343cf0d..4dcdb818d 100644 --- a/src/com/android/launcher2/AllAppsPagedView.java +++ b/src/com/android/launcher2/AllAppsPagedView.java @@ -443,7 +443,6 @@ public class AllAppsPagedView extends PagedView new PagedViewCellLayout.LayoutParams(0, 0, 2, 1)); } } - @Override public boolean onPrepareActionMode(ActionMode mode, Menu menu) { mode.setTitle(R.string.cab_app_selection_text); @@ -459,6 +458,12 @@ public class AllAppsPagedView extends PagedView mOrigInfoButtonParent.removeView(infoButton); infoButton.setManageVisibility(false); infoButton.setVisibility(View.VISIBLE); + infoButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + final ApplicationInfo appInfo = (ApplicationInfo) getChosenItem(); + mLauncher.startApplicationDetailsActivity(appInfo.componentName); + } + }); DeleteZone deleteZone = (DeleteZone) mLauncher.findViewById(R.id.delete_zone); mOrigDeleteZoneParent = (ViewGroup) deleteZone.getParent(); @@ -466,6 +471,12 @@ public class AllAppsPagedView extends PagedView mOrigDeleteZoneParent.removeView(deleteZone); deleteZone.setManageVisibility(false); deleteZone.setVisibility(View.VISIBLE); + deleteZone.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + final ApplicationInfo appInfo = (ApplicationInfo) getChosenItem(); + mLauncher.startApplicationUninstallActivity(appInfo); + } + }); menu.add(0, MENU_APP_INFO, 0, R.string.cab_menu_app_info).setActionView(infoButton); menu.add(0, MENU_DELETE_APP, 0, R.string.cab_menu_delete_app).setActionView(deleteZone); @@ -504,16 +515,7 @@ public class AllAppsPagedView extends PagedView @Override public boolean onActionItemClicked(ActionMode mode, MenuItem item) { - final int id = item.getItemId(); - - // Assumes that we are in CHOICE_MODE_SINGLE - final ApplicationInfo appInfo = (ApplicationInfo) getChosenItem(); - - if (id == MENU_APP_INFO) { - mLauncher.startApplicationDetailsActivity(appInfo.componentName); - } else if (id == MENU_DELETE_APP) { - mLauncher.startApplicationUninstallActivity(appInfo); - } + // This is never called. Because we use setActionView(), we handle our own click events. return false; } |