Merge change 27474 into eclair (9d686c93) · Commits · e / os / android_frameworks_base

core/java/android/app/SearchDialog.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -1709,16 +1709,19 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		public boolean dispatchKeyEventPreIme(KeyEvent event) {
		if (DBG) Log.d(LOG_TAG, "onKeyPreIme(" + event + ")");
		if (mSearchDialog != null && event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
		KeyEvent.DispatcherState state = getKeyDispatcherState();
		if (state != null) {
		if (event.getAction() == KeyEvent.ACTION_DOWN
		&& event.getRepeatCount() == 0) {
		getKeyDispatcherState().startTracking(event, this);
		state.startTracking(event, this);
		return true;
		} else if (event.getAction() == KeyEvent.ACTION_UP
		&& !event.isCanceled() && getKeyDispatcherState().isTracking(event)) {
		&& !event.isCanceled() && state.isTracking(event)) {
		mSearchDialog.onBackPressed();
		return true;
		}
		}
		}
		return super.dispatchKeyEventPreIme(event);
		}
		}