зеркало из https://github.com/mozilla/gecko-dev.git
Bug 746142 - Part 2 - Use inputmode attribute to vary the virtual keyboard on Android. f=mounir r=cpeterson
This commit is contained in:
Zoe Bellot
Родитель
5cd1fff7f7
Коммит
f5aa016a9c
|
|
@ -322,6 +322,8 @@ nsIMEStateManager::SetIMEState(const IMEState &aState,
|
|||
aContent->Tag() == nsGkAtoms::textarea)) {
|
||||
aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::type,
|
||||
context.mHTMLInputType);
|
||||
aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::inputmode,
|
||||
context.mHTMLInputInputmode);
|
||||
aContent->GetAttr(kNameSpaceID_None, nsGkAtoms::moz_action_hint,
|
||||
context.mActionHint);
|
||||
|
||||
|
|
|
|||
|
|
@ -163,6 +163,7 @@ parent:
|
|||
SetInputContext(PRInt32 IMEEnabled,
|
||||
PRInt32 IMEOpen,
|
||||
nsString type,
|
||||
nsString inputmode,
|
||||
nsString actionHint,
|
||||
PRInt32 cause,
|
||||
PRInt32 focusChange);
|
||||
|
|
|
|||
|
|
@ -682,6 +682,7 @@ bool
|
|||
TabParent::RecvSetInputContext(const PRInt32& aIMEEnabled,
|
||||
const PRInt32& aIMEOpen,
|
||||
const nsString& aType,
|
||||
const nsString& aInputmode,
|
||||
const nsString& aActionHint,
|
||||
const PRInt32& aCause,
|
||||
const PRInt32& aFocusChange)
|
||||
|
|
@ -699,6 +700,7 @@ TabParent::RecvSetInputContext(const PRInt32& aIMEEnabled,
|
|||
context.mIMEState.mEnabled = static_cast<IMEState::Enabled>(aIMEEnabled);
|
||||
context.mIMEState.mOpen = static_cast<IMEState::Open>(aIMEOpen);
|
||||
context.mHTMLInputType.Assign(aType);
|
||||
context.mHTMLInputInputmode.Assign(aInputmode);
|
||||
context.mActionHint.Assign(aActionHint);
|
||||
InputContextAction action(
|
||||
static_cast<InputContextAction::Cause>(aCause),
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@ public:
|
|||
virtual bool RecvSetInputContext(const PRInt32& aIMEEnabled,
|
||||
const PRInt32& aIMEOpen,
|
||||
const nsString& aType,
|
||||
const nsString& aInputmode,
|
||||
const nsString& aActionHint,
|
||||
const PRInt32& aCause,
|
||||
const PRInt32& aFocusChange);
|
||||
|
|
|
|||
|
|
@ -539,7 +539,7 @@ public class GeckoAppShell
|
|||
}
|
||||
}
|
||||
|
||||
public static void notifyIMEEnabled(int state, String typeHint,
|
||||
public static void notifyIMEEnabled(int state, String typeHint, String modeHint,
|
||||
String actionHint, boolean landscapeFS)
|
||||
{
|
||||
if (GeckoApp.surfaceView == null)
|
||||
|
|
@ -549,6 +549,7 @@ public class GeckoAppShell
|
|||
In addition, the IME UI is hidden */
|
||||
GeckoApp.surfaceView.mIMEState = state;
|
||||
GeckoApp.surfaceView.mIMETypeHint = typeHint;
|
||||
GeckoApp.surfaceView.mIMEModeHint = modeHint;
|
||||
GeckoApp.surfaceView.mIMEActionHint = actionHint;
|
||||
GeckoApp.surfaceView.mIMELandscapeFS = landscapeFS;
|
||||
IMEStateUpdater.enableIME();
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ class GeckoSurfaceView
|
|||
initEditable("");
|
||||
mIMEState = IME_STATE_DISABLED;
|
||||
mIMETypeHint = "";
|
||||
mIMEModeHint = "";
|
||||
mIMEActionHint = "";
|
||||
}
|
||||
|
||||
|
|
@ -502,6 +503,20 @@ class GeckoSurfaceView
|
|||
else if (mIMETypeHint.equalsIgnoreCase("time"))
|
||||
outAttrs.inputType = InputType.TYPE_CLASS_DATETIME |
|
||||
InputType.TYPE_DATETIME_VARIATION_TIME;
|
||||
else if (mIMEModeHint.equalsIgnoreCase("numeric"))
|
||||
outAttrs.inputType = InputType.TYPE_CLASS_NUMBER |
|
||||
InputType.TYPE_NUMBER_FLAG_SIGNED |
|
||||
InputType.TYPE_NUMBER_FLAG_DECIMAL;
|
||||
else if (mIMEModeHint.equalsIgnoreCase("digit"))
|
||||
outAttrs.inputType = InputType.TYPE_CLASS_NUMBER;
|
||||
else if (mIMEModeHint.equalsIgnoreCase("uppercase"))
|
||||
outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS;
|
||||
else if (mIMEModeHint.equalsIgnoreCase("lowercase"))
|
||||
outAttrs.inputType = InputType.TYPE_CLASS_TEXT;
|
||||
else if (mIMEModeHint.equalsIgnoreCase("titlecase"))
|
||||
outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_WORDS;
|
||||
else if (mIMEModeHint.equalsIgnoreCase("autocapitalized"))
|
||||
outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
|
||||
|
||||
if (mIMEActionHint.equalsIgnoreCase("go"))
|
||||
outAttrs.imeOptions = EditorInfo.IME_ACTION_GO;
|
||||
|
|
@ -748,6 +763,7 @@ class GeckoSurfaceView
|
|||
Editable.Factory mEditableFactory;
|
||||
int mIMEState;
|
||||
String mIMETypeHint;
|
||||
String mIMEModeHint;
|
||||
String mIMEActionHint;
|
||||
boolean mIMELandscapeFS;
|
||||
|
||||
|
|
|
|||
|
|
@ -576,12 +576,12 @@ public class GeckoAppShell
|
|||
mInputConnection.notifyIME(type, state);
|
||||
}
|
||||
|
||||
public static void notifyIMEEnabled(int state, String typeHint,
|
||||
public static void notifyIMEEnabled(int state, String typeHint, String modeHint,
|
||||
String actionHint, boolean landscapeFS) {
|
||||
// notifyIMEEnabled() still needs the landscapeFS parameter because it is called from JNI
|
||||
// code that assumes it has the same signature as XUL Fennec's (which does use landscapeFS).
|
||||
if (mInputConnection != null)
|
||||
mInputConnection.notifyIMEEnabled(state, typeHint, actionHint);
|
||||
mInputConnection.notifyIMEEnabled(state, typeHint, modeHint, actionHint);
|
||||
}
|
||||
|
||||
public static void notifyIMEChange(String text, int start, int end, int newEnd) {
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@ class GeckoInputConnection
|
|||
private static final Timer mIMETimer = new Timer("GeckoInputConnection Timer");
|
||||
private static int mIMEState;
|
||||
private static String mIMETypeHint = "";
|
||||
private static String mIMEModeHint;
|
||||
private static String mIMEActionHint = "";
|
||||
|
||||
private String mCurrentInputMethod;
|
||||
|
|
@ -806,6 +807,20 @@ class GeckoInputConnection
|
|||
else if (mIMETypeHint.equalsIgnoreCase("time"))
|
||||
outAttrs.inputType = InputType.TYPE_CLASS_DATETIME
|
||||
| InputType.TYPE_DATETIME_VARIATION_TIME;
|
||||
else if (mIMEModeHint.equalsIgnoreCase("numeric"))
|
||||
outAttrs.inputType = InputType.TYPE_CLASS_NUMBER |
|
||||
InputType.TYPE_NUMBER_FLAG_SIGNED |
|
||||
InputType.TYPE_NUMBER_FLAG_DECIMAL;
|
||||
else if (mIMEModeHint.equalsIgnoreCase("digit"))
|
||||
outAttrs.inputType = InputType.TYPE_CLASS_NUMBER;
|
||||
else if (mIMEModeHint.equalsIgnoreCase("uppercase"))
|
||||
outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS;
|
||||
else if (mIMEModeHint.equalsIgnoreCase("lowercase"))
|
||||
outAttrs.inputType = InputType.TYPE_CLASS_TEXT;
|
||||
else if (mIMEModeHint.equalsIgnoreCase("titlecase"))
|
||||
outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_WORDS;
|
||||
else if (mIMEModeHint.equalsIgnoreCase("autocapitalized"))
|
||||
outAttrs.inputType |= InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
|
||||
|
||||
if (mIMEActionHint.equalsIgnoreCase("go"))
|
||||
outAttrs.imeOptions = EditorInfo.IME_ACTION_GO;
|
||||
|
|
@ -1044,7 +1059,7 @@ class GeckoInputConnection
|
|||
});
|
||||
}
|
||||
|
||||
public void notifyIMEEnabled(final int state, final String typeHint, final String actionHint) {
|
||||
public void notifyIMEEnabled(final int state, final String typeHint, final String modeHint, final String actionHint) {
|
||||
postToUiThread(new Runnable() {
|
||||
public void run() {
|
||||
View v = getView();
|
||||
|
|
@ -1055,6 +1070,7 @@ class GeckoInputConnection
|
|||
In addition, the IME UI is hidden */
|
||||
mIMEState = state;
|
||||
mIMETypeHint = (typeHint == null) ? "" : typeHint;
|
||||
mIMEModeHint = (modeHint == null) ? "" : modeHint;
|
||||
mIMEActionHint = (actionHint == null) ? "" : actionHint;
|
||||
IMEStateUpdater.enableIME();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ AndroidBridge::Init(JNIEnv *jEnv,
|
|||
mGeckoAppShellClass = (jclass) jEnv->NewGlobalRef(jGeckoAppShellClass);
|
||||
|
||||
jNotifyIME = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "notifyIME", "(II)V");
|
||||
jNotifyIMEEnabled = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "notifyIMEEnabled", "(ILjava/lang/String;Ljava/lang/String;Z)V");
|
||||
jNotifyIMEEnabled = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "notifyIMEEnabled", "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V");
|
||||
jNotifyIMEChange = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "notifyIMEChange", "(Ljava/lang/String;III)V");
|
||||
jNotifyScreenShot = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "notifyScreenShot", "(Ljava/nio/ByteBuffer;IIIIIIII)V");
|
||||
jAcknowledgeEventSync = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "acknowledgeEventSync", "()V");
|
||||
|
|
@ -263,7 +263,7 @@ jstring NewJavaString(AutoLocalJNIFrame* frame, const PRUnichar* string, PRUint3
|
|||
|
||||
void
|
||||
AndroidBridge::NotifyIMEEnabled(int aState, const nsAString& aTypeHint,
|
||||
const nsAString& aActionHint)
|
||||
const nsAString& aModeHint, const nsAString& aActionHint)
|
||||
{
|
||||
ALOG_BRIDGE("AndroidBridge::NotifyIMEEnabled");
|
||||
if (!sBridge)
|
||||
|
|
@ -275,18 +275,20 @@ AndroidBridge::NotifyIMEEnabled(int aState, const nsAString& aTypeHint,
|
|||
|
||||
AutoLocalJNIFrame jniFrame(env);
|
||||
nsPromiseFlatString typeHint(aTypeHint);
|
||||
nsPromiseFlatString modeHint(aModeHint);
|
||||
nsPromiseFlatString actionHint(aActionHint);
|
||||
|
||||
jvalue args[4];
|
||||
jvalue args[5];
|
||||
args[0].i = aState;
|
||||
args[1].l = NewJavaString(&jniFrame, typeHint.get(), typeHint.Length());
|
||||
args[2].l = NewJavaString(&jniFrame, actionHint.get(), actionHint.Length());
|
||||
args[3].z = false;
|
||||
args[2].l = env->NewString(modeHint.get(), modeHint.Length());
|
||||
args[3].l = env->NewString(actionHint.get(), actionHint.Length());
|
||||
args[4].z = false;
|
||||
|
||||
PRInt32 landscapeFS;
|
||||
if (NS_SUCCEEDED(Preferences::GetInt(IME_FULLSCREEN_PREF, &landscapeFS))) {
|
||||
if (landscapeFS == 1) {
|
||||
args[3].z = true;
|
||||
args[4].z = true;
|
||||
} else if (landscapeFS == -1){
|
||||
if (NS_SUCCEEDED(
|
||||
Preferences::GetInt(IME_FULLSCREEN_THRESHOLD_PREF,
|
||||
|
|
@ -295,7 +297,7 @@ AndroidBridge::NotifyIMEEnabled(int aState, const nsAString& aTypeHint,
|
|||
// threshold to pixels and multiply the height by 100
|
||||
if (nsWindow::GetAndroidScreenBounds().height * 100 <
|
||||
landscapeFS * Bridge()->GetDPI()) {
|
||||
args[3].z = true;
|
||||
args[4].z = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ public:
|
|||
static void NotifyIME(int aType, int aState);
|
||||
|
||||
static void NotifyIMEEnabled(int aState, const nsAString& aTypeHint,
|
||||
const nsAString& aActionHint);
|
||||
const nsAString& aModeHint, const nsAString& aActionHint);
|
||||
|
||||
static void NotifyIMEChange(const PRUnichar *aText, PRUint32 aTextLen, int aStart, int aEnd, int aNewEnd);
|
||||
|
||||
|
|
|
|||
|
|
@ -2115,6 +2115,7 @@ nsWindow::SetInputContext(const InputContext& aContext,
|
|||
|
||||
AndroidBridge::NotifyIMEEnabled(enabled,
|
||||
aContext.mHTMLInputType,
|
||||
aContext.mHTMLInputInputmode,
|
||||
aContext.mActionHint);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -281,6 +281,9 @@ struct InputContext {
|
|||
/* The type of the input if the input is a html input field */
|
||||
nsString mHTMLInputType;
|
||||
|
||||
/* The type of the inputmode */
|
||||
nsString mHTMLInputInputmode;
|
||||
|
||||
/* A hint for the action that is performed when the input is submitted */
|
||||
nsString mActionHint;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -363,6 +363,7 @@ PuppetWidget::SetInputContext(const InputContext& aContext,
|
|||
static_cast<PRInt32>(aContext.mIMEState.mEnabled),
|
||||
static_cast<PRInt32>(aContext.mIMEState.mOpen),
|
||||
aContext.mHTMLInputType,
|
||||
aContext.mHTMLInputInputmode,
|
||||
aContext.mActionHint,
|
||||
static_cast<PRInt32>(aAction.mCause),
|
||||
static_cast<PRInt32>(aAction.mFocusChange));
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче