diff options
author | Patrick Dubroy <dubroy@google.com> | 2010-10-25 14:28:58 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-25 14:28:58 -0700 |
commit | 2319179db2f3be5c9f90628c3db76795a563140a (patch) | |
tree | 60b726c9850b13af38e6bae35a154b31002af4e1 | |
parent | a50c66365b84b3c157bef7364559acd629a5c69a (diff) | |
parent | 3c6dbcdcfe75bddc1e8876a29c2f33b127d6321d (diff) | |
download | android_packages_apps_Trebuchet-2319179db2f3be5c9f90628c3db76795a563140a.tar.gz android_packages_apps_Trebuchet-2319179db2f3be5c9f90628c3db76795a563140a.tar.bz2 android_packages_apps_Trebuchet-2319179db2f3be5c9f90628c3db76795a563140a.zip |
Merge "Fix crash when dragging from all apps to home."
-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); |