diff options
| author | Winson Chung <winsonc@google.com> | 2011-08-05 15:05:12 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-08-05 15:07:02 -0700 |
| commit | e7a0394ad468748fb4651c74b44b313e1e07cab6 (patch) | |
| tree | 1fdbd5a99d73ad73b3c27b679f4613aca55589a7 /src/com/android | |
| parent | b8472bb83cd96456a543137e1e56d589171934c3 (diff) | |
| download | android_packages_apps_Trebuchet-e7a0394ad468748fb4651c74b44b313e1e07cab6.tar.gz android_packages_apps_Trebuchet-e7a0394ad468748fb4651c74b44b313e1e07cab6.tar.bz2 android_packages_apps_Trebuchet-e7a0394ad468748fb4651c74b44b313e1e07cab6.zip | |
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
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 6d8fd4da2..1fa32101b 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1139,6 +1139,10 @@ public final class Launcher extends Activity 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 @@ public final class Launcher extends Activity // 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(); |