summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Launcher.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-08-05 16:03:32 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-05 16:03:32 -0700
commitf45f5eba0c8a01dc05ba9ad6a8ef942cb0eaca88 (patch)
tree39e8ef58f51b7d7fa18c11aeaa7e488305eda686 /src/com/android/launcher2/Launcher.java
parent57e0ae249038ed9fda446ae45d0b916110eca50f (diff)
parente7a0394ad468748fb4651c74b44b313e1e07cab6 (diff)
downloadpackages_apps_trebuchet-f45f5eba0c8a01dc05ba9ad6a8ef942cb0eaca88.zip
packages_apps_trebuchet-f45f5eba0c8a01dc05ba9ad6a8ef942cb0eaca88.tar.gz
packages_apps_trebuchet-f45f5eba0c8a01dc05ba9ad6a8ef942cb0eaca88.tar.bz2
Merge "Fixing crash and updating default layout"
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r--src/com/android/launcher2/Launcher.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 1af3f71..bb7bdf5 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();
@@ -2179,7 +2183,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();