diff options
| author | Romain Guy <romainguy@android.com> | 2009-06-17 16:18:58 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@android.com> | 2009-06-17 16:18:58 -0700 |
| commit | 94406848f62e6990fa169fc40672c752f8419cf2 (patch) | |
| tree | 27af5664da802386899176871371131b4ab1496b /src/com/android/launcher/Launcher.java | |
| parent | 529100b752f581cc281ca664410129282ca09d74 (diff) | |
| download | android_packages_apps_Trebuchet-94406848f62e6990fa169fc40672c752f8419cf2.tar.gz android_packages_apps_Trebuchet-94406848f62e6990fa169fc40672c752f8419cf2.tar.bz2 android_packages_apps_Trebuchet-94406848f62e6990fa169fc40672c752f8419cf2.zip | |
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.
Diffstat (limited to 'src/com/android/launcher/Launcher.java')
| -rw-r--r-- | src/com/android/launcher/Launcher.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java index fb454c061..02bb19d2c 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(); } |