Fixing crash and updating default layout
- Fixing dragging/rotation crash due to runnables referencing old Launcher activity (5122814)
- Updating default layout to add portal and contents (4998213)
Change-Id: I87658e7119a2b86aea25ebc7ecc82ee0ebcffc1e
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 6d8fd4d..1fa3210 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1139,6 +1139,10 @@
public void onDestroy() {
super.onDestroy();
+ // Remove all pending runnables
+ mHandler.removeMessages(ADVANCE_MSG);
+ mHandler.removeMessages(0);
+
// Stop callbacks from LauncherModel
LauncherApplication app = ((LauncherApplication) getApplication());
mModel.stopLoader();
@@ -2175,7 +2179,7 @@
// Otherwise, we are not in spring loaded mode, so don't do anything.
}
void exitSpringLoadedDragModeDelayed(final boolean successfulDrop, boolean extendedDelay) {
- mWorkspace.postDelayed(new Runnable() {
+ mHandler.postDelayed(new Runnable() {
@Override
public void run() {
exitSpringLoadedDragMode();