Supplement for I772164d9c67e95876c228efcce2

This should be merged with I1519258dd3ce95ad01

Change-Id: I48c5f86ff43f51913eb69d697bb1d75714b67aa3

2 files changed, 17 insertions, 5 deletions

diff --git a/core/java/android/view/textservice/SpellCheckerInfo.java b/core/java/android/view/textservice/SpellCheckerInfo.java
index 137743a..d05c1af 100644
--- a/core/java/android/view/textservice/SpellCheckerInfo.java
+++ b/core/java/android/view/textservice/SpellCheckerInfo.java
@@ -45,6 +45,7 @@ public final class SpellCheckerInfo implements Parcelable {
     private final ResolveInfo mService;
     private final String mId;
     private final int mLabel;
+    private final boolean mSupportsSentenceSpellCheck;
 
     /**
      * The spell checker setting activity's name, used by the system settings to
@@ -97,6 +98,9 @@ public final class SpellCheckerInfo implements Parcelable {
             label = sa.getResourceId(com.android.internal.R.styleable.SpellChecker_label, 0);
             settingsActivityComponent = sa.getString(
                     com.android.internal.R.styleable.SpellChecker_settingsActivity);
+            mSupportsSentenceSpellCheck = sa.getBoolean(
+                    com.android.internal.R.styleable.SpellChecker_supportsSentenceSpellCheck,
+                    false);
             sa.recycle();
 
             final int depth = parser.getDepth();
@@ -138,6 +142,7 @@ public final class SpellCheckerInfo implements Parcelable {
      */
     public SpellCheckerInfo(Parcel source) {
         mLabel = source.readInt();
+        mSupportsSentenceSpellCheck = source.readInt() != 0;
         mId = source.readString();
         mSettingsActivityName = source.readString();
         mService = ResolveInfo.CREATOR.createFromParcel(source);
@@ -152,6 +157,12 @@ public final class SpellCheckerInfo implements Parcelable {
         return mId;
     }
 
+    /**
+     * @hide
+     */
+    public boolean isSentenceSpellCheckSupported() {
+        return mSupportsSentenceSpellCheck;
+    }
 
     /**
      * Return the component of the service that implements.
@@ -177,6 +188,7 @@ public final class SpellCheckerInfo implements Parcelable {
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(mLabel);
+        dest.writeInt(mSupportsSentenceSpellCheck ? 1 : 0);
         dest.writeString(mId);
         dest.writeString(mSettingsActivityName);
         mService.writeToParcel(dest, flags);
diff --git a/core/java/android/view/textservice/SpellCheckerSession.java b/core/java/android/view/textservice/SpellCheckerSession.java
index 35940ba..9dc05e4 100644
--- a/core/java/android/view/textservice/SpellCheckerSession.java
+++ b/core/java/android/view/textservice/SpellCheckerSession.java
@@ -436,15 +436,15 @@ public class SpellCheckerSession {
      */
     public interface SpellCheckerSessionListener {
         /**
-         * Callback for {@link SpellCheckerSession#getSuggestions(TextInfo[], int, boolean)}
+         * Callback for {@link SpellCheckerSession#getSuggestions(TextInfo, int)}
+         * and {@link SpellCheckerSession#getSuggestions(TextInfo[], int, boolean)}
          * @param results an array of {@link SuggestionsInfo}s.
          * These results are suggestions for {@link TextInfo}s queried by
-         * {@link SpellCheckerSession#getSuggestions(TextInfo[], int, boolean)}.
+         * {@link SpellCheckerSession#getSuggestions(TextInfo, int)} or
+         * {@link SpellCheckerSession#getSuggestions(TextInfo[], int, boolean)}
          */
         public void onGetSuggestions(SuggestionsInfo[] results);
-        // TODO: Remove @hide as soon as the sample spell checker client gets fixed.
         /**
-         * @hide
          * Callback for {@link SpellCheckerSession#getSentenceSuggestions(TextInfo[], int)}
          * @param results an array of {@link SentenceSuggestionsInfo}s.
          * These results are suggestions for {@link TextInfo}s
@@ -494,7 +494,7 @@ public class SpellCheckerSession {
     }
 
     /**
-     * @hide
+     * @return true if the spell checker supports sentence level spell checking APIs
      */
     public boolean isSentenceSpellCheckSupported() {
         return mSubtype.containsExtraValueKey(SUPPORT_SENTENCE_SPELL_CHECK);