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

am f3fe6820: Merge "NPE fix" into honeycomb

Browse Source 
* commit 'f3fe6820927d335f09c27e026702d2b0d4a69923':
  NPE fix
This commit is contained in:
Michael Jurka
2011-01-16 17:56:44 -08:00
committed by Android Git Automerger
parent 2d439e62a7 f3fe682092
commit 8bea5f7449
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/AllAppsPagedView.java
+4 -2
View File
@@ -221,11 +221,13 @@ public class AllAppsPagedView extends PagedViewWithDraggableItems implements All
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();