Merge change 25362 into eclair (76f01118) · Commits · e / os / android_frameworks_base

core/java/android/app/SearchDialog.java

+40 −75

Original line number	Diff line number	Diff line
		@@ -739,11 +739,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		return false;
		}

		// handle back key to go back to previous searchable, etc.
		if (handleBackKey(keyCode, event)) {
		return true;
		}

		if (keyCode == KeyEvent.KEYCODE_SEARCH) {
		// Consume search key for later use.
		return true;
		@@ -757,7 +752,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		return true;
		}

		return false;
		return super.onKeyDown(keyCode, event);
		}

		@Override
		@@ -767,11 +762,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		return false;
		}

		// handle back key to go back to previous searchable, etc.
		if (handleBackKey(keyCode, event)) {
		return true;
		}

		if (keyCode == KeyEvent.KEYCODE_SEARCH && event.isTracking()
		&& !event.isCanceled()) {
		// If the search key is pressed, toggle between global and in-app search. If we are
		@@ -780,7 +770,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		return toggleGlobalSearch();
		}

		return false;
		return super.onKeyUp(keyCode, event);
		}

		/**
		@@ -1487,6 +1477,13 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		mSearchAutoComplete.setListSelection(index);
		}

		/**
		* Checks if there are any previous searchable components in the history stack.
		*/
		private boolean hasPreviousComponent() {
		return mPreviousComponents != null && !mPreviousComponents.isEmpty();
		}

		/**
		* Saves the previous component that was searched, so that we can go
		* back to it.
		@@ -1505,14 +1502,10 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		* no previous component.
		*/
		private ComponentName popPreviousComponent() {
		if (mPreviousComponents == null) {
		if (!hasPreviousComponent()) {
		return null;
		}
		int size = mPreviousComponents.size();
		if (size == 0) {
		return null;
		}
		return mPreviousComponents.remove(size - 1);
		return mPreviousComponents.remove(mPreviousComponents.size() - 1);
		}

		/**
		@@ -1520,13 +1513,12 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		*
		* @return <code>true</code> if there was a previous component that we could go back to.
		*/
		private boolean backToPreviousComponent(boolean doIt) {
		private boolean backToPreviousComponent() {
		ComponentName previous = popPreviousComponent();
		if (previous == null) {
		return false;
		}

		if (doIt) {
		if (!show(previous, mAppSearchData, false)) {
		Log.w(LOG_TAG, "Failed to switch to source " + previous);
		return false;
		@@ -1537,8 +1529,6 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		// the source that we are now going back to?
		String query = mSearchAutoComplete.getText().toString();
		setUserQuery(query);
		}

		return true;
		}

		@@ -1763,72 +1753,47 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
		*/
		@Override
		public boolean onKeyPreIme(int keyCode, KeyEvent event) {
		if (DBG) Log.d(LOG_TAG, "onKeyPreIme(" + keyCode + "," + event + ")");
		if (mSearchDialog.mSearchable == null) {
		return false;
		}
		if (keyCode == KeyEvent.KEYCODE_BACK) {
		if (event.getAction() == KeyEvent.ACTION_DOWN
		&& event.getRepeatCount() == 0) {
		// We release the back key, might we want to do
		// something before the IME?
		if (mSearchDialog.backToPreviousComponent(false)) {
		getKeyDispatcherState().startTracking(event, this);
		return true;
		}
		if (isInputMethodNotNeeded() \|\|
		(isEmpty() && getDropDownChildCount() >= getAdapterCount())) {
		if (mSearchDialog.hasPreviousComponent() \|\| isDismissingKeyboardPointless()) {
		getKeyDispatcherState().startTracking(event, this);
		return true;
		}
		return false; // will dismiss soft keyboard if necessary
		} else if (event.getAction() == KeyEvent.ACTION_UP
		&& event.isTracking() && !event.isCanceled()) {
		if (mSearchDialog.backToPreviousComponent(true)) {
		if (mSearchDialog.backToPreviousComponent()) {
		return true;
		}
		// If the drop-down obscures the keyboard, the user wouldn't see anything
		// happening when pressing back, so we dismiss the entire dialog instead.
		//
		// also: if there is no text entered, we also want to dismiss the whole dialog,
		// not just the soft keyboard. the exception to this is if there are shortcuts
		// that aren't displayed (e.g are being obscured by the soft keyboard); in that
		// case we want to dismiss the soft keyboard so the user can see the rest of the
		// shortcuts.
		if (isInputMethodNotNeeded() \|\|
		(isEmpty() && getDropDownChildCount() >= getAdapterCount())) {
		} else if (isDismissingKeyboardPointless()) {
		mSearchDialog.cancel();
		return true;
		}
		return false; // will dismiss soft keyboard if necessary
		}
		}
		return false;
		}

		// If the drop-down obscures the keyboard, or if the drop-down shows all suggestions,
		// dismissing the keyboard is pointless, so we dismiss the entire dialog instead.
		private boolean isDismissingKeyboardPointless() {
		return (isInputMethodNotNeeded() \|\| getDropDownChildCount() >= getAdapterCount());
		}

		private int getAdapterCount() {
		final ListAdapter adapter = getAdapter();
		return adapter == null ? 0 : adapter.getCount();
		}
		}

		protected boolean handleBackKey(int keyCode, KeyEvent event) {
		if (keyCode == KeyEvent.KEYCODE_BACK) {
		if (event.getAction() == KeyEvent.ACTION_DOWN
		&& event.getRepeatCount() == 0) {
		// Consume the event, to get an up at which point we execute.
		event.startTracking();
		return true;
		}
		if (event.getAction() == KeyEvent.ACTION_UP && event.isTracking()
		&& !event.isCanceled()) {
		if (backToPreviousComponent(true)) {
		return true;
		}
		@Override
		public void onBackPressed() {
		if (!backToPreviousComponent()) {
		cancel();
		}
		return true;
		}
		return false;
		}

		/**