commit b0d35c42eb5951cdfedfe72953d6d889dbe46be9
author Romain Guy <romainguy@android.com> Wed Jun 17 21:49:14 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed Jun 17 21:49:14 2009 -0700
tree ce96fab16d5ec9e40597017b444db0bc9b3ec83e
parent 451aba03184e6577bdccf9dc0b1a51648176f2f9
parent 94406848f62e6990fa169fc40672c752f8419cf2

am 94406848: 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.

Merge commit '94406848f62e6990fa169fc40672c752f8419cf2'

* commit '94406848f62e6990fa169fc40672c752f8419cf2':
  Close the gestures pad when pressing Home. A regression was recently introduced when

src/com/android/launcher/Launcher.java

diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index fb454c0..02bb19d 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -870,9 +870,12 @@
                     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();
                     }