diff options
Diffstat (limited to 'src/com/android/launcher2')
-rw-r--r-- | src/com/android/launcher2/AllAppsPagedView.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher2/AllAppsPagedView.java b/src/com/android/launcher2/AllAppsPagedView.java index 54b2d27b0..54343cf0d 100644 --- a/src/com/android/launcher2/AllAppsPagedView.java +++ b/src/com/android/launcher2/AllAppsPagedView.java @@ -481,15 +481,18 @@ public class AllAppsPagedView extends PagedView @Override public void onDestroyActionMode(ActionMode mode) { + final Menu menu = mode.getMenu(); + // Re-parent the drop targets into the toolbar, and restore their layout params + ApplicationInfoDropTarget infoButton = - (ApplicationInfoDropTarget) mLauncher.findViewById(R.id.info_button); + (ApplicationInfoDropTarget) menu.findItem(MENU_APP_INFO).getActionView(); ((ViewGroup) infoButton.getParent()).removeView(infoButton); mOrigInfoButtonParent.addView(infoButton, mOrigInfoButtonLayoutParams); infoButton.setVisibility(View.GONE); infoButton.setManageVisibility(true); - DeleteZone deleteZone = (DeleteZone) mLauncher.findViewById(R.id.delete_zone); + DeleteZone deleteZone = (DeleteZone) menu.findItem(MENU_DELETE_APP).getActionView(); ((ViewGroup) deleteZone.getParent()).removeView(deleteZone); mOrigDeleteZoneParent.addView(deleteZone, mOrigDeleteZoneLayoutParams); deleteZone.setVisibility(View.GONE); |