From a0aa0121b91fde17e427ab2763ce312e64cf5d33 Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Thu, 24 Feb 2011 11:42:23 -0800
Subject: [PATCH] Fix issue with some home button presses being ignored.

We are ignoring home button presses after panning away from
the default screen, when the workspace is still moving slightly.

Also, make the home button a no-op when the user is in the
middle of panning the screen (i.e. finger is still down).

Change-Id: Ida6bad4faaf90b6802aac2cbf3444f76b7b38100
---
 src/com/android/launcher2/Launcher.java  | 2 +-
 src/com/android/launcher2/Workspace.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 792047287c..59f142a418 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1449,7 +1449,7 @@ public final class Launcher extends Activity
                 mWorkspace.unshrink(alreadyOnHome);
             }
 
-            if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isDefaultPageShowing()) {
+            if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isTouchActive()) {
                 mWorkspace.moveToDefaultScreen(true);
             }
             showWorkspace(alreadyOnHome);
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index fe54ae7b6e..394614fac6 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -419,8 +419,8 @@ public class Workspace extends SmoothPagedView
         return folders;
     }
 
-    boolean isDefaultPageShowing() {
-        return mCurrentPage == mDefaultPage;
+    boolean isTouchActive() {
+        return mTouchState != TOUCH_STATE_REST;
     }
 
     /**