Add new resize mode to not resize, new web input types.
Change-Id: Ib098c03793d08532c3c099b59d0cc6b567e54900
diff --git a/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java b/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
index 44f30f7..01fc010 100644
--- a/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
+++ b/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
@@ -31,7 +31,6 @@
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 {
diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java
index 24ea7d2..17c9ee7 100644
--- a/core/java/android/inputmethodservice/IInputMethodWrapper.java
+++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java
@@ -70,6 +70,7 @@
final WeakReference<AbstractInputMethodService> mTarget;
final HandlerCaller mCaller;
final WeakReference<InputMethod> mInputMethod;
+ final int mTargetSdkVersion;
static class Notifier {
boolean notified;
@@ -102,6 +103,7 @@
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 @@
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 @@
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: {
diff --git a/core/java/android/inputmethodservice/InputMethodService.java b/core/java/android/inputmethodservice/InputMethodService.java
index c0743cfe..a1f2b63 100644
--- a/core/java/android/inputmethodservice/InputMethodService.java
+++ b/core/java/android/inputmethodservice/InputMethodService.java
@@ -1945,6 +1945,8 @@
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);
}
diff --git a/core/java/android/text/InputType.java b/core/java/android/text/InputType.java
index 8592221..7b8acd9 100644
--- a/core/java/android/text/InputType.java
+++ b/core/java/android/text/InputType.java
@@ -228,6 +228,28 @@
*/
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;
+
// ----------------------------------------------------------------------
// ----------------------------------------------------------------------
// ----------------------------------------------------------------------
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 0b2d0f6..e5f4b08 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -762,6 +762,12 @@
*/
public static final int SOFT_INPUT_ADJUST_PAN = 0x20;
+ /** Adjustment option for {@link #softInputMode}: set to have a window
+ * not adjust for a shown input method. The window will not be resized,
+ * and it will not be panned to make its focus visible.
+ */
+ public static final int SOFT_INPUT_ADJUST_NOTHING = 0x30;
+
/**
* Bit for {@link #softInputMode}: set when the user has navigated
* forward to the window. This is normally set automatically for
@@ -772,27 +778,6 @@
public static final int SOFT_INPUT_IS_FORWARD_NAVIGATION = 0x100;
/**
- * Default value for {@link #screenBrightness} and {@link #buttonBrightness}
- * indicating that the brightness value is not overridden for this window
- * and normal brightness policy should be used.
- */
- public static final float BRIGHTNESS_OVERRIDE_NONE = -1.0f;
-
- /**
- * Value for {@link #screenBrightness} and {@link #buttonBrightness}
- * indicating that the screen or button backlight brightness should be set
- * to the lowest value when this window is in front.
- */
- public static final float BRIGHTNESS_OVERRIDE_OFF = 0.0f;
-
- /**
- * Value for {@link #screenBrightness} and {@link #buttonBrightness}
- * indicating that the screen or button backlight brightness should be set
- * to the hightest value when this window is in front.
- */
- public static final float BRIGHTNESS_OVERRIDE_FULL = 1.0f;
-
- /**
* Desired operating mode for any soft input area. May any combination
* of:
*
@@ -852,6 +837,27 @@
* dim.
*/
public float dimAmount = 1.0f;
+
+ /**
+ * Default value for {@link #screenBrightness} and {@link #buttonBrightness}
+ * indicating that the brightness value is not overridden for this window
+ * and normal brightness policy should be used.
+ */
+ public static final float BRIGHTNESS_OVERRIDE_NONE = -1.0f;
+
+ /**
+ * Value for {@link #screenBrightness} and {@link #buttonBrightness}
+ * indicating that the screen or button backlight brightness should be set
+ * to the lowest value when this window is in front.
+ */
+ public static final float BRIGHTNESS_OVERRIDE_OFF = 0.0f;
+
+ /**
+ * Value for {@link #screenBrightness} and {@link #buttonBrightness}
+ * indicating that the screen or button backlight brightness should be set
+ * to the hightest value when this window is in front.
+ */
+ public static final float BRIGHTNESS_OVERRIDE_FULL = 1.0f;
/**
* This can be used to override the user's preferred brightness of
diff --git a/core/java/android/view/inputmethod/EditorInfo.java b/core/java/android/view/inputmethod/EditorInfo.java
index b98dcd2..300e5d6 100644
--- a/core/java/android/view/inputmethod/EditorInfo.java
+++ b/core/java/android/view/inputmethod/EditorInfo.java
@@ -94,6 +94,45 @@
public static final int IME_ACTION_DONE = 0x00000006;
/**
+ * Bits of {@link #IME_MASK_ACTION}: Like {@link #IME_ACTION_NEXT}, but
+ * for moving to the previous field. This will normally not be used to
+ * specify an action (since it precludes {@link #IME_ACTION_NEXT}, but
+ * can be returned to the app if it sets {@link #IME_FLAG_NAVIGATE_PREVIOUS}.
+ */
+ public static final int IME_ACTION_PREVIOUS = 0x00000007;
+
+ /**
+ * Flag of {@link #imeOptions}: used to request that the IME never go
+ * into fullscreen mode. Applications need to be aware that the flag is not
+ * a guarantee, and not all IMEs will respect it.
+ */
+ public static final int IME_FLAG_NO_FULLSCREEN = 0x2000000;
+
+ /**
+ * Flag of {@link #imeOptions}: like {@link #IME_FLAG_NAVIGATE_NEXT}, but
+ * specifies there is something interesting that a backward navigation
+ * can focus on. If the user selects the IME's facility to backward
+ * navigate, this will show up in the application as an {@link #IME_ACTION_PREVIOUS}
+ * at {@link InputConnection#performEditorAction(int)
+ * InputConnection.performEditorAction(int)}.
+ */
+ public static final int IME_FLAG_NAVIGATE_PREVIOUS = 0x4000000;
+
+ /**
+ * Flag of {@link #imeOptions}: used to specify that there is something
+ * interesting that a forward navigation can focus on. This is like using
+ * {@link #IME_ACTION_NEXT}, except allows the IME to be multiline (with
+ * an enter key) as well as provide forward navigation. Note that some
+ * IMEs may not be able to do this, especially when running on a small
+ * screen where there is little space. In that case it does not need to
+ * present a UI for this option. Like {@link #IME_ACTION_NEXT}, if the
+ * user selects the IME's facility to forward navigate, this will show up
+ * in the application at {@link InputConnection#performEditorAction(int)
+ * InputConnection.performEditorAction(int)}.
+ */
+ public static final int IME_FLAG_NAVIGATE_NEXT = 0x8000000;
+
+ /**
* Flag of {@link #imeOptions}: used to specify that the IME does not need
* to show its extracted text UI. For input methods that may be fullscreen,
* often when in landscape mode, this allows them to be smaller and let part
@@ -129,14 +168,6 @@
public static final int IME_FLAG_NO_ENTER_ACTION = 0x40000000;
/**
- * Flag of {@link #imeOptions}: used to request that the IME never go
- * into fullscreen mode. Applications need to be aware that the flag is not
- * a guarantee, and not all IMEs will respect it.
- * @hide
- */
- public static final int IME_FLAG_NO_FULLSCREEN = 0x80000000;
-
- /**
* Generic unspecified type for {@link #imeOptions}.
*/
public static final int IME_NULL = 0x00000000;
@@ -240,6 +271,34 @@
public Bundle extras;
/**
+ * Ensure that the data in this EditorInfo is compatible with an application
+ * that was developed against the given target API version. This can
+ * impact the following input types:
+ * {@link InputType#TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS},
+ * {@link InputType#TYPE_TEXT_VARIATION_WEB_PASSWORD}.
+ *
+ * <p>This is called by the framework for input method implementations;
+ * you should not generally need to call it yourself.
+ *
+ * @param targetSdkVersion The API version number that the compatible
+ * application was developed against.
+ */
+ public final void makeCompatible(int targetSdkVersion) {
+ if (targetSdkVersion < android.os.Build.VERSION_CODES.HONEYCOMB) {
+ switch (inputType&(TYPE_MASK_CLASS|TYPE_MASK_VARIATION)) {
+ case TYPE_CLASS_TEXT|TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS:
+ inputType = TYPE_CLASS_TEXT|TYPE_TEXT_VARIATION_EMAIL_ADDRESS
+ | (inputType&(~TYPE_MASK_FLAGS));
+ break;
+ case TYPE_CLASS_TEXT|TYPE_TEXT_VARIATION_WEB_PASSWORD:
+ inputType = TYPE_CLASS_TEXT|TYPE_TEXT_VARIATION_PASSWORD
+ | (inputType&(~TYPE_MASK_FLAGS));
+ break;
+ }
+ }
+ }
+
+ /**
* Write debug output of this object.
*/
public void dump(Printer pw, String prefix) {
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index ef15f6f..9855d6e 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -3229,7 +3229,8 @@
* for this text view. The default implementation will call your action
* listener supplied to {@link #setOnEditorActionListener}, or perform
* a standard operation for {@link EditorInfo#IME_ACTION_NEXT
- * EditorInfo.IME_ACTION_NEXT} or {@link EditorInfo#IME_ACTION_DONE
+ * EditorInfo.IME_ACTION_NEXT}, {@link EditorInfo#IME_ACTION_PREVIOUS
+ * EditorInfo.IME_ACTION_PREVIOUS}, or {@link EditorInfo#IME_ACTION_DONE
* EditorInfo.IME_ACTION_DONE}.
*
* <p>For backwards compatibility, if no IME options have been set and the
@@ -3266,6 +3267,16 @@
}
return;
+ } else if (actionCode == EditorInfo.IME_ACTION_PREVIOUS) {
+ View v = focusSearch(FOCUS_UP);
+ if (v != null) {
+ if (!v.requestFocus(FOCUS_UP)) {
+ throw new IllegalStateException("focus search returned a view " +
+ "that wasn't able to take focus!");
+ }
+ }
+ return;
+
} else if (actionCode == EditorInfo.IME_ACTION_DONE) {
InputMethodManager imm = InputMethodManager.peekInstance();
if (imm != null) {
@@ -4680,9 +4691,15 @@
} else {
outAttrs.imeOptions = EditorInfo.IME_NULL;
}
+ if (focusSearch(FOCUS_DOWN) != null) {
+ outAttrs.imeOptions |= EditorInfo.IME_FLAG_NAVIGATE_NEXT;
+ }
+ if (focusSearch(FOCUS_UP) != null) {
+ outAttrs.imeOptions |= EditorInfo.IME_FLAG_NAVIGATE_PREVIOUS;
+ }
if ((outAttrs.imeOptions&EditorInfo.IME_MASK_ACTION)
== EditorInfo.IME_ACTION_UNSPECIFIED) {
- if (focusSearch(FOCUS_DOWN) != null) {
+ if ((outAttrs.imeOptions&EditorInfo.IME_FLAG_NAVIGATE_NEXT) != 0) {
// An action has not been set, but the enter key will move to
// the next focus, so set the action to that.
outAttrs.imeOptions |= EditorInfo.IME_ACTION_NEXT;
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 0cac7eb..79131ba 100755
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -326,6 +326,9 @@
need to close the input area to get at and interact with
parts of the window. -->
<flag name="adjustPan" value="0x20" />
+ <!-- Don't resize <em>or</em> pan the window to make room for the
+ soft input area; the window is never adjusted for it. -->
+ <flag name="adjustNothing" value="0x30" />
</attr>
<!-- Flag allowing you to disable the preview animation for a window.
@@ -737,6 +740,14 @@
{@link android.text.InputType#TYPE_CLASS_TEXT} |
{@link android.text.InputType#TYPE_TEXT_VARIATION_PHONETIC}. -->
<flag name="textPhonetic" value="0x000000c1" />
+ <!-- Text that will be used as an e-mail address on a web form. Corresponds to
+ {@link android.text.InputType#TYPE_CLASS_TEXT} |
+ {@link android.text.InputType#TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS}. -->
+ <flag name="textWebEmailAddress" value="0x000000d1" />
+ <!-- Text that will be used as a password on a web form. Corresponds to
+ {@link android.text.InputType#TYPE_CLASS_TEXT} |
+ {@link android.text.InputType#TYPE_TEXT_VARIATION_WEB_PASSWORD}. -->
+ <flag name="textWebPassword" value="0x000000e1" />
<!-- A numeric only field. Corresponds to
{@link android.text.InputType#TYPE_CLASS_NUMBER}. -->
<flag name="number" value="0x00000002" />
@@ -811,6 +822,40 @@
Corresponds to
{@link android.view.inputmethod.EditorInfo#IME_ACTION_DONE}. -->
<flag name="actionDone" value="0x00000006" />
+ <!-- The action key performs a "previous"
+ operation, taking the user to the previous field that will accept text.
+ Corresponds to
+ {@link android.view.inputmethod.EditorInfo#IME_ACTION_PREVIOUS}. -->
+ <flag name="actionPrevious" value="0x00000007" />
+ <!-- Used to request that the IME never go
+ into fullscreen mode. Applications need to be aware that the flag is not
+ a guarantee, and not all IMEs will respect it.
+ <p>Corresponds to
+ {@link android.view.inputmethod.EditorInfo#IME_FLAG_NO_FULLSCREEN}. -->
+ <flag name="flagNoFullscreen" value="0x2000000" />
+ <!-- Like flagNavigateNext, but
+ specifies there is something interesting that a backward navigation
+ can focus on. If the user selects the IME's facility to backward
+ navigate, this will show up in the application as an actionPrevious
+ at {@link android.view.inputmethod.InputConnection#performEditorAction(int)
+ InputConnection.performEditorAction(int)}.
+ <p>Corresponds to
+ {@link android.view.inputmethod.EditorInfo#IME_FLAG_NO_FULLSCREEN}. -->
+ <flag name="flagNavigatePrevious" value="0x4000000" />
+ <!-- Used to specify that there is something
+ interesting that a forward navigation can focus on. This is like using
+ actionNext, except allows the IME to be multiline (with
+ an enter key) as well as provide forward navigation. Note that some
+ IMEs may not be able to do this, especially when running on a small
+ screen where there is little space. In that case it does not need to
+ present a UI for this option. Like actionNext, if the
+ user selects the IME's facility to forward navigate, this will show up
+ in the application at
+ {@link android.view.inputmethod.InputConnection#performEditorAction(int)
+ InputConnection.performEditorAction(int)}.
+ <p>Corresponds to
+ {@link android.view.inputmethod.EditorInfo#IME_FLAG_NAVIGATE_NEXT}. -->
+ <flag name="flagNavigateNext" value="0x8000000" />
<!-- Used to specify that the IME does not need
to show its extracted text UI. For input methods that may be fullscreen,
often when in landscape mode, this allows them to be smaller and let part
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index b427a0e..f8c7b69 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2326,6 +2326,9 @@
<!-- Long label for a button on a full-screen input method for the "Done" action. -->
<string name="ime_action_done">Done</string>
+ <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+ <string name="ime_action_previous">Prev</string>
+
<!-- Long label for a button on a full-screen input method for an unknown action. -->
<string name="ime_action_default">Execute</string>