diff options
author | Romain Guy <romainguy@android.com> | 2009-06-10 11:53:57 -0700 |
---|---|---|
committer | Romain Guy <romainguy@android.com> | 2009-06-10 11:53:57 -0700 |
commit | b8734248181509727a8a19372650dc804d58c21e (patch) | |
tree | 8e7596d232747a9cc1eff1d3832eadb6d42d5543 /src | |
parent | aad5ef44c665fc4ce143a61c009dc04be3ab0437 (diff) | |
download | android_packages_apps_Trebuchet-b8734248181509727a8a19372650dc804d58c21e.tar.gz android_packages_apps_Trebuchet-b8734248181509727a8a19372650dc804d58c21e.tar.bz2 android_packages_apps_Trebuchet-b8734248181509727a8a19372650dc804d58c21e.zip |
Fixes 1909513.
Do not show the gestures pad when the user is in the search dialog.
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher/Launcher.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/launcher/Launcher.java b/src/com/android/launcher/Launcher.java index 51b720bcf..88c411a95 100644 --- a/src/com/android/launcher/Launcher.java +++ b/src/com/android/launcher/Launcher.java @@ -587,7 +587,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On final GestureOverlayView overlay = mGesturesOverlay; overlay.setFadeOffset(GesturesConstants.MATCH_DELAY); overlay.addOnGestureListener(mGesturesProcessor); - overlay.getGesturePaint().setXfermode(new PorterDuffXfermode(PorterDuff.Mode.MULTIPLY)); + overlay.getGesturePaint().setXfermode(new PorterDuffXfermode(PorterDuff.Mode.MULTIPLY)); } private void createGesture() { @@ -869,7 +869,11 @@ public final class Launcher extends Activity implements View.OnClickListener, On Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) { if (mGesturesPanel != null && mDragLayer.getWindowVisibility() == View.VISIBLE) { - onHomeKeyPressed(); + SearchManager searchManager = + (SearchManager) getSystemService(Context.SEARCH_SERVICE); + if (!searchManager.isVisible()) { + onHomeKeyPressed(); + } } closeDrawer(); @@ -2419,7 +2423,7 @@ public final class Launcher extends Activity implements View.OnClickListener, On void update(ApplicationInfo info, Gesture gesture) { mGesturesOverlay.setGesture(gesture); - updatePrompt(info); + updatePrompt(info); } class GestureMatcher implements Runnable { |