Merge "Make few of the new IMS API methods final" into pi-dev (7dba4973) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -21217,7 +21217,7 @@ package android.inputmethodservice {
		method public void onWindowHidden();
		method public void onWindowShown();
		method public void requestHideSelf(int);
		method public void requestShowSelf(int);
		method public final void requestShowSelf(int);
		method public boolean sendDefaultEditorAction(boolean);
		method public void sendDownUpKeyEvents(int);
		method public void sendKeyChar(char);
		@@ -21227,13 +21227,13 @@ package android.inputmethodservice {
		method public void setExtractView(android.view.View);
		method public void setExtractViewShown(boolean);
		method public void setInputView(android.view.View);
		method public boolean shouldOfferSwitchingToNextInputMethod();
		method public final boolean shouldOfferSwitchingToNextInputMethod();
		method public void showStatusIcon(int);
		method public void showWindow(boolean);
		method public void switchInputMethod(java.lang.String);
		method public void switchInputMethod(java.lang.String, android.view.inputmethod.InputMethodSubtype);
		method public boolean switchToNextInputMethod(boolean);
		method public boolean switchToPreviousInputMethod();
		method public final void switchInputMethod(java.lang.String, android.view.inputmethod.InputMethodSubtype);
		method public final boolean switchToNextInputMethod(boolean);
		method public final boolean switchToPreviousInputMethod();
		method public void updateFullscreenMode();
		method public void updateInputViewShown();
		field public static final int BACK_DISPOSITION_DEFAULT = 0; // 0x0

core/java/android/inputmethodservice/InputMethodService.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -1081,7 +1081,7 @@ public class InputMethodService extends AbstractInputMethodService {
		* @return true if the current input method and subtype was successfully switched to the last
		* used input method and subtype.
		*/
		public boolean switchToPreviousInputMethod() {
		public final boolean switchToPreviousInputMethod() {
		return mImm.switchToPreviousInputMethodInternal(mToken);
		}

		@@ -1093,7 +1093,7 @@ public class InputMethodService extends AbstractInputMethodService {
		* @return true if the current input method and subtype was successfully switched to the next
		* input method and subtype.
		*/
		public boolean switchToNextInputMethod(boolean onlyCurrentIme) {
		public final boolean switchToNextInputMethod(boolean onlyCurrentIme) {
		return mImm.switchToNextInputMethodInternal(mToken, onlyCurrentIme);
		}

		@@ -1106,7 +1106,7 @@ public class InputMethodService extends AbstractInputMethodService {
		* and subtype in order to provide the consistent user experience in switching
		* between IMEs and subtypes.
		*/
		public boolean shouldOfferSwitchingToNextInputMethod() {
		public final boolean shouldOfferSwitchingToNextInputMethod() {
		return mImm.shouldOfferSwitchingToNextInputMethodInternal(mToken);
		}

		@@ -1450,7 +1450,7 @@ public class InputMethodService extends AbstractInputMethodService {
		* @param id Unique identifier of the new input method to start.
		* @param subtype The new subtype of the new input method to be switched to.
		*/
		public void switchInputMethod(String id, InputMethodSubtype subtype) {
		public final void switchInputMethod(String id, InputMethodSubtype subtype) {
		mImm.setInputMethodAndSubtypeInternal(mToken, id, subtype);
		}

		@@ -2059,7 +2059,7 @@ public class InputMethodService extends AbstractInputMethodService {
		* @see InputMethodManager#SHOW_FORCED
		* @param flags Provides additional operating flags.
		*/
		public void requestShowSelf(int flags) {
		public final void requestShowSelf(int flags) {
		mImm.showSoftInputFromInputMethodInternal(mToken, flags);
		}