Merge "Create TextServiceManager and SpellCheckerService" (7793719c) · Commits · e / os / android_frameworks_base

Android.mk

+10 −0

Original line number	Diff line number	Diff line
		@@ -158,6 +158,11 @@ LOCAL_SRC_FILES += \
		core/java/com/android/internal/os/IResultReceiver.aidl \
		core/java/com/android/internal/statusbar/IStatusBar.aidl \
		core/java/com/android/internal/statusbar/IStatusBarService.aidl \
		core/java/com/android/internal/textservice/ISpellCheckerService.aidl \
		core/java/com/android/internal/textservice/ISpellCheckerSession.aidl \
		core/java/com/android/internal/textservice/ISpellCheckerSessionListener.aidl \
		core/java/com/android/internal/textservice/ITextServicesManager.aidl \
		core/java/com/android/internal/textservice/ITextServicesSessionListener.aidl \
		core/java/com/android/internal/view/IInputContext.aidl \
		core/java/com/android/internal/view/IInputContextCallback.aidl \
		core/java/com/android/internal/view/IInputMethod.aidl \
		@@ -266,6 +271,11 @@ aidl_files := \
		frameworks/base/core/java/android/view/Surface.aidl \
		frameworks/base/core/java/android/view/WindowManager.aidl \
		frameworks/base/core/java/android/widget/RemoteViews.aidl \
		frameworks/base/core/java/com/android/internal/textservice/ISpellCheckerService.aidl \
		frameworks/base/core/java/com/android/internal/textservice/ISpellCheckerSession.aidl \
		frameworks/base/core/java/com/android/internal/textservice/ISpellCheckerSessionListener.aidl \
		frameworks/base/core/java/com/android/internal/textservice/ITextServicesManager.aidl \
		frameworks/base/core/java/com/android/internal/textservice/ITextServicesSessionListener.aidl \
		frameworks/base/core/java/com/android/internal/view/IInputContext.aidl \
		frameworks/base/core/java/com/android/internal/view/IInputMethod.aidl \
		frameworks/base/core/java/com/android/internal/view/IInputMethodCallback.aidl \

api/current.txt

+74 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ package android {
		field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";
		field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";
		field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
		field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
		field public static final java.lang.String BIND_WALLPAPER = "android.permission.BIND_WALLPAPER";
		field public static final java.lang.String BLUETOOTH = "android.permission.BLUETOOTH";
		field public static final java.lang.String BLUETOOTH_ADMIN = "android.permission.BLUETOOTH_ADMIN";
		@@ -4783,6 +4784,7 @@ package android.content {
		field public static final java.lang.String SENSOR_SERVICE = "sensor";
		field public static final java.lang.String STORAGE_SERVICE = "storage";
		field public static final java.lang.String TELEPHONY_SERVICE = "phone";
		field public static final java.lang.String TEXT_SERVICES_MANAGER_SERVICE = "textservices";
		field public static final java.lang.String UI_MODE_SERVICE = "uimode";
		field public static final java.lang.String USB_SERVICE = "usb";
		field public static final java.lang.String VIBRATOR_SERVICE = "vibrator";
		@@ -17941,6 +17943,30 @@ package android.security {

		}

		package android.service.textservice {

		public abstract class SpellCheckerService extends android.app.Service {
		ctor public SpellCheckerService();
		method public void cancel();
		method public abstract android.view.textservice.SuggestionsInfo getSuggestions(android.view.textservice.TextInfo, int, java.lang.String);
		method public android.view.textservice.SuggestionsInfo[] getSuggestionsMultiple(android.view.textservice.TextInfo[], java.lang.String, int, boolean);
		method public final android.os.IBinder onBind(android.content.Intent);
		field public static final java.lang.String SERVICE_INTERFACE;
		}

		public class SpellCheckerSession {
		method public void close();
		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 {

		public abstract class WallpaperService extends android.app.Service {
		@@ -24021,6 +24047,54 @@ package android.view.inputmethod {

		}

		package android.view.textservice {

		public final class SpellCheckerInfo implements android.os.Parcelable {
		method public int describeContents();
		method public android.content.ComponentName getComponent();
		method public java.lang.String getId();
		method public java.lang.String getPackageName();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public final class SuggestionsInfo implements android.os.Parcelable {
		ctor public SuggestionsInfo(int, java.lang.String[]);
		ctor public SuggestionsInfo(int, java.lang.String[], int, int);
		ctor public SuggestionsInfo(android.os.Parcel);
		method public int describeContents();
		method public int getCookie();
		method public int getSequence();
		method public java.lang.String getSuggestionAt(int);
		method public int getSuggestionsAttributes();
		method public int getSuggestionsCount();
		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_IN_THE_DICTIONARY = 1; // 0x1
		field public static final int RESULT_ATTR_LOOKS_TYPO = 4; // 0x4
		field public static final int RESULT_ATTR_SUGGESTIONS_AVAILABLE = 2; // 0x2
		}

		public final class TextInfo implements android.os.Parcelable {
		ctor public TextInfo(java.lang.String);
		ctor public TextInfo(java.lang.String, int, int);
		ctor public TextInfo(android.os.Parcel);
		method public int describeContents();
		method public int getCookie();
		method public int getSequence();
		method public java.lang.String getText();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

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

		}

		package android.webkit {

		public final deprecated class CacheManager {

core/java/android/app/ContextImpl.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ import android.view.ContextThemeWrapper;
		import android.view.WindowManagerImpl;
		import android.view.accessibility.AccessibilityManager;
		import android.view.inputmethod.InputMethodManager;
		import android.view.textservice.TextServicesManager;
		import android.accounts.AccountManager;
		import android.accounts.IAccountManager;
		import android.app.admin.DevicePolicyManager;
		@@ -320,6 +321,11 @@ class ContextImpl extends Context {
		return InputMethodManager.getInstance(ctx);
		}});

		registerService(TEXT_SERVICES_MANAGER_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		return TextServicesManager.getInstance();
		}});

		registerService(KEYGUARD_SERVICE, new ServiceFetcher() {
		public Object getService(ContextImpl ctx) {
		// TODO: why isn't this caching it? It wasn't

core/java/android/content/Context.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -1610,6 +1610,15 @@ public abstract class Context {
		*/
		public static final String INPUT_METHOD_SERVICE = "input_method";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.view.textservice.TextServicesManager} for accessing
		* text services.
		*
		* @see #getSystemService
		*/
		public static final String TEXT_SERVICES_MANAGER_SERVICE = "textservices";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.appwidget.AppWidgetManager} for accessing AppWidgets.

core/java/android/provider/Settings.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package android.provider;



		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.app.SearchManager;
		@@ -48,7 +46,6 @@ import java.net.URISyntaxException;
		import java.util.HashMap;
		import java.util.HashSet;


		/**
		* The Settings provider contains global system-level device preferences.
		*/
		@@ -3737,6 +3734,15 @@ public final class Settings {
		*/
		public static final String VOICE_RECOGNITION_SERVICE = "voice_recognition_service";


		/**
		* The {@link ComponentName} string of the service to be used as the spell checker
		* service which is one of the services managed by the text service manager.
		*
		* @hide
		*/
		public static final String SPELL_CHECKER_SERVICE = "spell_checker_service";

		/**
		* What happens when the user presses the Power button while in-call
		* and the screen is on.<br/>