summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsatok <satok@google.com>2011-10-31 12:26:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-31 12:26:23 +0000
commitd412f9f15b29865c458ebe2f4fbad95a2625c15c (patch)
tree0a1d4ad497ddaed181c2019577113f252799757d
parent266d9ad1f87ffe2fd670897b3d053d3857b86ef0 (diff)
parent4a6d0879465ea6eb52b2b75e9fa2a4a84e1b0d86 (diff)
downloadframeworks_base-d412f9f15b29865c458ebe2f4fbad95a2625c15c.zip
frameworks_base-d412f9f15b29865c458ebe2f4fbad95a2625c15c.tar.gz
frameworks_base-d412f9f15b29865c458ebe2f4fbad95a2625c15c.tar.bz2
am 4a6d0879: Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1
* commit '4a6d0879465ea6eb52b2b75e9fa2a4a84e1b0d86': Add a flag for recommended suggestions of the spell checker
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/view/textservice/SuggestionsInfo.java6
2 files changed, 7 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 52df856..c963b4e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -24799,6 +24799,7 @@ package android.view.textservice {
method public void setCookieAndSequence(int, int);
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;
+ field public static final int RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS = 4; // 0x4
field public static final int RESULT_ATTR_IN_THE_DICTIONARY = 1; // 0x1
field public static final int RESULT_ATTR_LOOKS_LIKE_TYPO = 2; // 0x2
}
diff --git a/core/java/android/view/textservice/SuggestionsInfo.java b/core/java/android/view/textservice/SuggestionsInfo.java
index 62a06b9..ddd0361 100644
--- a/core/java/android/view/textservice/SuggestionsInfo.java
+++ b/core/java/android/view/textservice/SuggestionsInfo.java
@@ -39,6 +39,12 @@ public final class SuggestionsInfo implements Parcelable {
* word looks like a typo.
*/
public static final int RESULT_ATTR_LOOKS_LIKE_TYPO = 0x0002;
+ /**
+ * Flag of the attributes of the suggestions that can be obtained by
+ * {@link #getSuggestionsAttributes}: this tells that the text service thinks
+ * the result suggestions include highly recommended ones.
+ */
+ public static final int RESULT_ATTR_HAS_RECOMMENDED_SUGGESTIONS = 0x0004;
private final int mSuggestionsAttributes;
private final String[] mSuggestions;
private final boolean mSuggestionsAvailable;