am b8734248: Fixes 1909513.

Merge commit 'b8734248181509727a8a19372650dc804d58c21e'

* commit 'b8734248181509727a8a19372650dc804d58c21e':
  Fixes 1909513.
This commit is contained in:
Romain Guy 2009-06-10 12:21:16 -07:00 committed by The Android Open Source Project
commit fb78b43b30
1 changed files with 7 additions and 3 deletions

View File

@ -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 {