Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SearchDialog should only do DialogCursorProtocol stuff when in global search mode.

Browse Source
This commit is contained in:
Karl Rosaen
2009-06-04 17:59:44 +01:00
parent 1c54cf0903
commit 320b2eeeea
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/SuggestionsAdapter.java
View File

@@ -149,6 +149,7 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
* @param cursor The cursor to call. * @param cursor The cursor to call.
*/ */
private void callCursorPreClose(Cursor cursor) { private void callCursorPreClose(Cursor cursor) {
if (!mGlobalSearchMode) return;
final Bundle request = new Bundle(); final Bundle request = new Bundle();
request.putInt(DialogCursorProtocol.METHOD, DialogCursorProtocol.PRE_CLOSE); request.putInt(DialogCursorProtocol.METHOD, DialogCursorProtocol.PRE_CLOSE);
request.putInt(DialogCursorProtocol.PRE_CLOSE_SEND_MAX_DISPLAY_POS, mMaxDisplayed); request.putInt(DialogCursorProtocol.PRE_CLOSE_SEND_MAX_DISPLAY_POS, mMaxDisplayed);
@@ -178,6 +179,7 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
* @param cursor The cursor to call. * @param cursor The cursor to call.
*/ */
private void callCursorPostRefresh(Cursor cursor) { private void callCursorPostRefresh(Cursor cursor) {
if (!mGlobalSearchMode) return;
final Bundle request = new Bundle(); final Bundle request = new Bundle();
request.putInt(DialogCursorProtocol.METHOD, DialogCursorProtocol.POST_REFRESH); request.putInt(DialogCursorProtocol.METHOD, DialogCursorProtocol.POST_REFRESH);
final Bundle response = cursor.respond(request); final Bundle response = cursor.respond(request);
@@ -197,6 +199,7 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
* @param position The position that was clicked. * @param position The position that was clicked.
*/ */
void callCursorOnClick(Cursor cursor, int position) { void callCursorOnClick(Cursor cursor, int position) {
if (!mGlobalSearchMode) return;
final Bundle request = new Bundle(1); final Bundle request = new Bundle(1);
request.putInt(DialogCursorProtocol.METHOD, DialogCursorProtocol.CLICK); request.putInt(DialogCursorProtocol.METHOD, DialogCursorProtocol.CLICK);
request.putInt(DialogCursorProtocol.CLICK_SEND_POSITION, position); 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 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(); final Bundle request = new Bundle();
request.putInt(DialogCursorProtocol.METHOD, DialogCursorProtocol.THRESH_HIT); request.putInt(DialogCursorProtocol.METHOD, DialogCursorProtocol.THRESH_HIT);
mCursor.respond(request); mCursor.respond(request);