commit f3fe6820927d335f09c27e026702d2b0d4a69923
author Michael Jurka <mikejurka@google.com> Sun Jan 16 17:54:42 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jan 16 17:54:42 2011 -0800
tree 3b70e799a19c47416be838ff188d27964d56e055
parent bb1d1319f202ccda89c03c5b9c972d5d91a04995
parent c31820d29cd51a1f46f8ccf9f301a3e7c36d3af2

Merge "NPE fix" into honeycomb

src/com/android/launcher2/AllAppsPagedView.java

diff --git a/src/com/android/launcher2/AllAppsPagedView.java b/src/com/android/launcher2/AllAppsPagedView.java
index c9c069f..a15b73b 100644
--- a/src/com/android/launcher2/AllAppsPagedView.java
+++ b/src/com/android/launcher2/AllAppsPagedView.java
@@ -221,11 +221,13 @@
             public void run() {
                 DeleteZone allAppsDeleteZone =
                         (DeleteZone) mLauncher.findViewById(R.id.all_apps_delete_zone);
-                allAppsDeleteZone.setDragAndDropEnabled(false);
+                // if onDestroy was called on Launcher, we might have already deleted the
+                // all apps delete zone / info button, so check if they are null
+                if (allAppsDeleteZone != null) allAppsDeleteZone.setDragAndDropEnabled(false);
 
                 ApplicationInfoDropTarget allAppsInfoButton =
                     (ApplicationInfoDropTarget) mLauncher.findViewById(R.id.all_apps_info_target);
-                allAppsInfoButton.setDragAndDropEnabled(false);
+                if (allAppsInfoButton != null) allAppsInfoButton.setDragAndDropEnabled(false);
             }
         });
         resetCheckedGrandchildren();