Merge "Move SpellCheckerSession" (9407c601) · Commits · e / os / android_frameworks_base

api/current.txt

+14 −13

Original line number	Diff line number	Diff line
		@@ -18012,18 +18012,6 @@ package android.service.textservice {
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.textservice.SpellCheckerService";
		}

		public class SpellCheckerSession {
		method public void close();
		method public android.view.textservice.SpellCheckerInfo getSpellChecker();
		method public void getSuggestions(android.view.textservice.TextInfo, int);
		method public void getSuggestions(android.view.textservice.TextInfo[], int, boolean);
		method public boolean isSessionDisconnected();
		}

		public static abstract interface SpellCheckerSession.SpellCheckerSessionListener {
		method public abstract void onGetSuggestions(android.view.textservice.SuggestionsInfo[]);
		}

		}

		package android.service.wallpaper {
		@@ -24123,6 +24111,19 @@ package android.view.textservice {
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public class SpellCheckerSession {
		method public void close();
		method public android.view.textservice.SpellCheckerInfo getSpellChecker();
		method public void getSuggestions(android.view.textservice.TextInfo, int);
		method public void getSuggestions(android.view.textservice.TextInfo[], int, boolean);
		method public boolean isSessionDisconnected();
		field public static final java.lang.String SERVICE_META_DATA = "android.view.textservice.scs";
		}

		public static abstract interface SpellCheckerSession.SpellCheckerSessionListener {
		method public abstract void onGetSuggestions(android.view.textservice.SuggestionsInfo[]);
		}

		public final class SuggestionsInfo implements android.os.Parcelable {
		ctor public SuggestionsInfo(int, java.lang.String[]);
		ctor public SuggestionsInfo(int, java.lang.String[], int, int);
		@@ -24153,7 +24154,7 @@ package android.view.textservice {
		}

		public final class TextServicesManager {
		method public android.service.textservice.SpellCheckerSession newSpellCheckerSession(java.util.Locale, android.service.textservice.SpellCheckerSession.SpellCheckerSessionListener, boolean);
		method public android.view.textservice.SpellCheckerSession newSpellCheckerSession(java.util.Locale, android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener, boolean);
		}

		}

core/java/android/service/textservice/SpellCheckerSession.java→core/java/android/view/textservice/SpellCheckerSession.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package android.service.textservice;
		package android.view.textservice;

		import com.android.internal.textservice.ISpellCheckerSession;
		import com.android.internal.textservice.ISpellCheckerSessionListener;
		@@ -38,6 +38,12 @@ import java.util.Queue;
		public class SpellCheckerSession {
		private static final String TAG = SpellCheckerSession.class.getSimpleName();
		private static final boolean DBG = false;
		/**
		* Name under which a SpellChecker service component publishes information about itself.
		* This meta-data must reference an XML resource.
		**/
		public static final String SERVICE_META_DATA = "android.view.textservice.scs";


		private static final int MSG_ON_GET_SUGGESTION_MULTIPLE = 1;

core/java/android/view/textservice/TextServicesManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,9 +22,9 @@ import android.content.Context;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.service.textservice.SpellCheckerSession;
		import android.service.textservice.SpellCheckerSession.SpellCheckerSessionListener;
		import android.util.Log;
		import android.view.textservice.SpellCheckerSession;
		import android.view.textservice.SpellCheckerSession.SpellCheckerSessionListener;

		import java.util.Locale;