Merge "Removign optimations in onDestroy" into ub-launcher3-calgary
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index a5c6720..e2d3c25 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1951,13 +1951,11 @@
mWorkspace.removeCallbacks(mBuildLayersRunnable);
// Stop callbacks from LauncherModel
- LauncherAppState app = (LauncherAppState.getInstance());
-
// It's possible to receive onDestroy after a new Launcher activity has
// been created. In this case, don't interfere with the new Launcher.
if (mModel.isCurrentCallbacks(this)) {
mModel.stopLoader();
- app.setLauncher(null);
+ LauncherAppState.getInstance().setLauncher(null);
}
try {
@@ -1973,12 +1971,6 @@
unregisterReceiver(mCloseSystemDialogsReceiver);
- mDragLayer.clearAllResizeFrames();
- ((ViewGroup) mWorkspace.getParent()).removeAllViews();
- mWorkspace.removeAllWorkspaceScreens();
- mWorkspace = null;
- mDragController = null;
-
LauncherAnimUtils.onDestroyActivity();
if (mLauncherCallbacks != null) {
