summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher/Launcher.java
diff options
context:
space:
mode:
authorRomain Guy <romainguy@android.com>2009-06-16 13:25:29 -0700
committerRomain Guy <romainguy@android.com>2009-06-16 13:25:29 -0700
commite3895ae9212d8654af10983cbf62206ead02ec24 (patch)
treeee7551d0edd7cec7b74c2e68235e28df5de9868f /src/com/android/launcher/Launcher.java
parent91a9c9636f10f1e12cd1f660b2e330634fbdc7dc (diff)
downloadandroid_packages_apps_Trebuchet-e3895ae9212d8654af10983cbf62206ead02ec24.tar.gz
android_packages_apps_Trebuchet-e3895ae9212d8654af10983cbf62206ead02ec24.tar.bz2
android_packages_apps_Trebuchet-e3895ae9212d8654af10983cbf62206ead02ec24.zip
Fixes #1921372. Pressing Home with the window shade down would show gestures pad.
This change checks for the window focus before taking action. If the Home's window does not have focus, then the gestures pad is not shown.
Diffstat (limited to 'src/com/android/launcher/Launcher.java')
-rw-r--r--src/com/android/launcher/Launcher.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java
index 513108181..fb454c061 100644
--- a/src/com/android/launcher/Launcher.java
+++ b/src/com/android/launcher/Launcher.java
@@ -869,7 +869,8 @@ public final class Launcher extends Activity implements View.OnClickListener, On
if ((intent.getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) !=
Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) {
- if (mGesturesPanel != null && mDragLayer.getWindowVisibility() == View.VISIBLE) {
+ if (mGesturesPanel != null && mDragLayer.getWindowVisibility() == View.VISIBLE &&
+ mDragLayer.hasWindowFocus()) {
SearchManager searchManager =
(SearchManager) getSystemService(Context.SEARCH_SERVICE);
if (!searchManager.isVisible()) {