Merge "Add new resize mode to not resize, new web input types." (7f3154d7) · Commits · e / os / android_frameworks_base

api/current.xml

+90 −0

Original line number	Diff line number	Diff line
		@@ -175979,6 +175979,28 @@
		visibility="public"
		>
		</field>
		<field name="TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS"
		type="int"
		transient="false"
		volatile="false"
		value="208"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TYPE_TEXT_VARIATION_WEB_PASSWORD"
		type="int"
		transient="false"
		volatile="false"
		value="224"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		</interface>
		<class name="Layout"
		extends="java.lang.Object"
		@@ -211971,6 +211993,17 @@
		visibility="public"
		>
		</field>
		<field name="SOFT_INPUT_ADJUST_NOTHING"
		type="int"
		transient="false"
		volatile="false"
		value="48"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="SOFT_INPUT_ADJUST_PAN"
		type="int"
		transient="false"
		@@ -216285,6 +216318,19 @@
		<parameter name="prefix" type="java.lang.String">
		</parameter>
		</method>
		<method name="makeCompatible"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="targetSdkVersion" type="int">
		</parameter>
		</method>
		<method name="writeToParcel"
		return="void"
		abstract="false"
		@@ -216354,6 +216400,17 @@
		visibility="public"
		>
		</field>
		<field name="IME_ACTION_PREVIOUS"
		type="int"
		transient="false"
		volatile="false"
		value="7"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="IME_ACTION_SEARCH"
		type="int"
		transient="false"
		@@ -216387,6 +216444,28 @@
		visibility="public"
		>
		</field>
		<field name="IME_FLAG_NAVIGATE_NEXT"
		type="int"
		transient="false"
		volatile="false"
		value="134217728"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="IME_FLAG_NAVIGATE_PREVIOUS"
		type="int"
		transient="false"
		volatile="false"
		value="67108864"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="IME_FLAG_NO_ACCESSORY_ACTION"
		type="int"
		transient="false"
		@@ -216420,6 +216499,17 @@
		visibility="public"
		>
		</field>
		<field name="IME_FLAG_NO_FULLSCREEN"
		type="int"
		transient="false"
		volatile="false"
		value="33554432"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="IME_MASK_ACTION"
		type="int"
		transient="false"

core/java/android/inputmethodservice/IInputMethodSessionWrapper.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.view.MotionEvent;
		import android.view.inputmethod.CompletionInfo;
		import android.view.inputmethod.ExtractedText;
		import android.view.inputmethod.InputMethodSession;
		import android.view.inputmethod.EditorInfo;

		class IInputMethodSessionWrapper extends IInputMethodSession.Stub
		implements HandlerCaller.Callback {

core/java/android/inputmethodservice/IInputMethodWrapper.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ class IInputMethodWrapper extends IInputMethod.Stub
		final WeakReference<AbstractInputMethodService> mTarget;
		final HandlerCaller mCaller;
		final WeakReference<InputMethod> mInputMethod;
		final int mTargetSdkVersion;

		static class Notifier {
		boolean notified;
		@@ -102,6 +103,7 @@ class IInputMethodWrapper extends IInputMethod.Stub
		mTarget = new WeakReference<AbstractInputMethodService>(context);
		mCaller = new HandlerCaller(context.getApplicationContext(), this);
		mInputMethod = new WeakReference<InputMethod>(inputMethod);
		mTargetSdkVersion = context.getApplicationInfo().targetSdkVersion;
		}

		public InputMethod getInternalInputMethod() {
		@@ -151,7 +153,9 @@ class IInputMethodWrapper extends IInputMethod.Stub
		IInputContext inputContext = (IInputContext)args.arg1;
		InputConnection ic = inputContext != null
		? new InputConnectionWrapper(inputContext) : null;
		inputMethod.startInput(ic, (EditorInfo)args.arg2);
		EditorInfo info = (EditorInfo)args.arg2;
		info.makeCompatible(mTargetSdkVersion);
		inputMethod.startInput(ic, info);
		return;
		}
		case DO_RESTART_INPUT: {
		@@ -159,7 +163,9 @@ class IInputMethodWrapper extends IInputMethod.Stub
		IInputContext inputContext = (IInputContext)args.arg1;
		InputConnection ic = inputContext != null
		? new InputConnectionWrapper(inputContext) : null;
		inputMethod.restartInput(ic, (EditorInfo)args.arg2);
		EditorInfo info = (EditorInfo)args.arg2;
		info.makeCompatible(mTargetSdkVersion);
		inputMethod.restartInput(ic, info);
		return;
		}
		case DO_CREATE_SESSION: {

core/java/android/inputmethodservice/InputMethodService.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -1945,6 +1945,8 @@ public class InputMethodService extends AbstractInputMethodService {
		return getText(com.android.internal.R.string.ime_action_next);
		case EditorInfo.IME_ACTION_DONE:
		return getText(com.android.internal.R.string.ime_action_done);
		case EditorInfo.IME_ACTION_PREVIOUS:
		return getText(com.android.internal.R.string.ime_action_previous);
		default:
		return getText(com.android.internal.R.string.ime_action_default);
		}

core/java/android/text/InputType.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -228,6 +228,28 @@ public interface InputType {
		*/
		public static final int TYPE_TEXT_VARIATION_PHONETIC = 0x000000c0;

		/**
		* Variation of {@link #TYPE_CLASS_TEXT}: entering e-mail address inside
		* of a web form. This was added in
		* {@link android.os.Build.VERSION_CODES#HONEYCOMB}. An IME must target
		* this API version or later to see this input type; if it doesn't, a request
		* for this type will be seen as {@link #TYPE_TEXT_VARIATION_EMAIL_ADDRESS}
		* when passed through {@link android.view.inputmethod.EditorInfo#makeCompatible(int)
		* EditorInfo.makeCompatible(int)}.
		*/
		public static final int TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS = 0x000000d0;

		/**
		* Variation of {@link #TYPE_CLASS_TEXT}: entering password inside
		* of a web form. This was added in
		* {@link android.os.Build.VERSION_CODES#HONEYCOMB}. An IME must target
		* this API version or later to see this input type; if it doesn't, a request
		* for this type will be seen as {@link #TYPE_TEXT_VARIATION_PASSWORD}
		* when passed through {@link android.view.inputmethod.EditorInfo#makeCompatible(int)
		* EditorInfo.makeCompatible(int)}.
		*/
		public static final int TYPE_TEXT_VARIATION_WEB_PASSWORD = 0x000000e0;

		// ----------------------------------------------------------------------
		// ----------------------------------------------------------------------
		// ----------------------------------------------------------------------