From 94406848f62e6990fa169fc40672c752f8419cf2 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Wed, 17 Jun 2009 16:18:58 -0700
Subject: [PATCH] Close the gestures pad when pressing Home. A regression was
 recently introduced when ignoring the Home key press when Home's window does
 not have focus.

---
 src/com/android/launcher/Launcher.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index fb454c0613..02bb19d2c7 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -870,9 +870,12 @@ public final class Launcher extends Activity implements View.OnClickListener, On
                     Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) {
 
                 if (mGesturesPanel != null && mDragLayer.getWindowVisibility() == View.VISIBLE &&
-                        mDragLayer.hasWindowFocus()) {
+                        (mDragLayer.hasWindowFocus() ||
+                                (mGesturesWindow != null && mGesturesWindow.isShowing()))) {
+
                     SearchManager searchManager =
                             (SearchManager) getSystemService(Context.SEARCH_SERVICE);
+
                     if (!searchManager.isVisible()) {
                         onHomeKeyPressed();
                     }