PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enable clicking on CAB buttons

Browse Source 
Change-Id: I7ac99fb1b90aad2816e371b8d4b363b7ddae057c
This commit is contained in:
Patrick Dubroy
2010-10-25 18:00:59 -07:00
parent 7fcaf0e75c
commit b3c81cc83c
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/AllAppsPagedView.java
+13 -11
View File
@@ -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;
}