am 320b2eee: SearchDialog should only do DialogCursorProtocol stuff when in global search mode.

Merge commit '320b2eeeea426dc06f7bb7f37c3d795babeb6adb'

* commit '320b2eeeea426dc06f7bb7f37c3d795babeb6adb':
  SearchDialog should only do DialogCursorProtocol stuff when in global search mode.
This commit is contained in:
Karl Rosaen
2009-06-04 22:41:22 -07:00
committed by The Android Open Source Project

View File

@@ -149,6 +149,7 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
* @param cursor The cursor to call.
*/
private void callCursorPreClose(Cursor cursor) {
if (!mGlobalSearchMode) return;
final Bundle request = new Bundle();
request.putInt(DialogCursorProtocol.METHOD, DialogCursorProtocol.PRE_CLOSE);
request.putInt(DialogCursorProtocol.PRE_CLOSE_SEND_MAX_DISPLAY_POS, mMaxDisplayed);
@@ -178,6 +179,7 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
* @param cursor The cursor to call.
*/
private void callCursorPostRefresh(Cursor cursor) {
if (!mGlobalSearchMode) return;
final Bundle request = new Bundle();
request.putInt(DialogCursorProtocol.METHOD, DialogCursorProtocol.POST_REFRESH);
final Bundle response = cursor.respond(request);
@@ -197,6 +199,7 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
* @param position The position that was clicked.
*/
void callCursorOnClick(Cursor cursor, int position) {
if (!mGlobalSearchMode) return;
final Bundle request = new Bundle(1);
request.putInt(DialogCursorProtocol.METHOD, DialogCursorProtocol.CLICK);
request.putInt(DialogCursorProtocol.CLICK_SEND_POSITION, position);
@@ -244,7 +247,7 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
}
// if the cursor wishes to be notified about this position, send it
if (mDisplayNotifyPos != NONE && pos == mDisplayNotifyPos) {
if (mGlobalSearchMode && mDisplayNotifyPos != NONE && pos == mDisplayNotifyPos) {
final Bundle request = new Bundle();
request.putInt(DialogCursorProtocol.METHOD, DialogCursorProtocol.THRESH_HIT);
mCursor.respond(request);