summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Bringert <bringert@android.com>2009-07-27 09:42:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-07-27 09:42:14 -0700
commitd0b1faa441802fa133c03daf9d3a6466bb7f16d8 (patch)
tree452bb6e973937d560a9306ed4465b72630ec38cb
parente624ee4e57a65e95b4e9176f614d4fc4b1ca1b23 (diff)
parent6ddaa3497ce7af2c303771365449501e2be52511 (diff)
downloadframeworks_base-d0b1faa441802fa133c03daf9d3a6466bb7f16d8.zip
frameworks_base-d0b1faa441802fa133c03daf9d3a6466bb7f16d8.tar.gz
frameworks_base-d0b1faa441802fa133c03daf9d3a6466bb7f16d8.tar.bz2
am 6ddaa349: Send max displayed position in search dialog click event
Merge commit '6ddaa3497ce7af2c303771365449501e2be52511' * commit '6ddaa3497ce7af2c303771365449501e2be52511': Send max displayed position in search dialog click event
-rw-r--r--core/java/android/app/SearchManager.java2
-rw-r--r--core/java/android/app/SuggestionsAdapter.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java
index 0631ad5..000f394 100644
--- a/core/java/android/app/SearchManager.java
+++ b/core/java/android/app/SearchManager.java
@@ -1227,6 +1227,8 @@ public class SearchManager
public final static int CLICK = 2;
public final static String CLICK_SEND_POSITION
= "DialogCursorProtocol.CLICK.sendPosition";
+ public final static String CLICK_SEND_MAX_DISPLAY_POS
+ = "DialogCursorProtocol.CLICK.sendDisplayPosition";
public final static String CLICK_RECEIVE_SELECTED_POS
= "DialogCursorProtocol.CLICK.receiveSelectedPosition";
diff --git a/core/java/android/app/SuggestionsAdapter.java b/core/java/android/app/SuggestionsAdapter.java
index 17e6e50..67ca734 100644
--- a/core/java/android/app/SuggestionsAdapter.java
+++ b/core/java/android/app/SuggestionsAdapter.java
@@ -274,7 +274,9 @@ class SuggestionsAdapter extends ResourceCursorAdapter {
final Bundle request = new Bundle(1);
request.putInt(DialogCursorProtocol.METHOD, DialogCursorProtocol.CLICK);
request.putInt(DialogCursorProtocol.CLICK_SEND_POSITION, position);
+ request.putInt(DialogCursorProtocol.CLICK_SEND_MAX_DISPLAY_POS, mMaxDisplayed);
final Bundle response = cursor.respond(request);
+ mMaxDisplayed = -1;
mListItemToSelect = response.getInt(
DialogCursorProtocol.CLICK_RECEIVE_SELECTED_POS, SuggestionsAdapter.NONE);
}