From 39bfc13a77b25aa9e1dc322b223030545c9af2c1 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Wed, 18 Nov 2009 17:22:01 -0800 Subject: [PATCH 1/2] Add more logging for bugs 2262649, 2262272 and 2265943. --- src/com/android/launcher2/Launcher.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 3e878d6a12..a9d0c1ab24 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2205,6 +2205,14 @@ public final class Launcher extends Activity */ public void dumpState() { Log.d(TAG, "BEGIN launcher2 dump state for launcher " + this); + Log.d(TAG, "mSavedState=" + mSavedState); + Log.d(TAG, "mIsNewIntent=" + mIsNewIntent); + Log.d(TAG, "mWorkspaceLoading=" + mWorkspaceLoading); + Log.d(TAG, "mRestoring=" + mRestoring); + Log.d(TAG, "mWaitingForResult=" + mWaitingForResult); + Log.d(TAG, "mSavedInstanceState=" + mSavedInstanceState); + Log.d(TAG, "mDesktopItems.size=" + mDesktopItems.size()); + Log.d(TAG, "mFolders.size=" + mFolders.size()); mModel.dumpState(); mAllAppsGrid.dumpState(); Log.d(TAG, "END launcher2 dump state"); From 247226b1d57dfc6571bdb7c83787e63f7409f2ab Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Wed, 18 Nov 2009 17:43:22 -0800 Subject: [PATCH 2/2] Fix bug 2266095 - all apps animates out when you return home by hitting back We needed to check that they haven't exited on the down event. --- src/com/android/launcher2/Launcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index a9d0c1ab24..cbf09b0b08 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1332,7 +1332,7 @@ public final class Launcher extends Activity } else if (event.getAction() == KeyEvent.ACTION_UP) { switch (event.getKeyCode()) { case KeyEvent.KEYCODE_BACK: - if (!event.isCanceled()) { + if (event.isTracking() && !event.isCanceled()) { mWorkspace.dispatchKeyEvent(event); if (isAllAppsVisible()) { closeAllApps(true);