wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 825120 - Fake selection update to force IME hard reset; r=cpeterson

Browse Source
This commit is contained in:
Jim Chen 2013-01-11 15:34:58 -05:00
parent 6f81fa5b99
commit c9a7f04a76
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mobile/android/base/GeckoInputConnection.java
View File

@ -10,6 +10,7 @@ import org.mozilla.gecko.gfx.InputConnectionHandler;
import android.R;
import android.content.Context;
import android.os.Build;
import android.os.SystemClock;
import android.text.Editable;
import android.text.InputType;
import android.text.Selection;
@ -52,7 +53,7 @@ class GeckoInputConnection
private final ExtractedText mUpdateExtract = new ExtractedText();
private boolean mBatchSelectionChanged;
private boolean mBatchTextChanged;
private Runnable mRestartInputRunnable;
private long mLastRestartInputTime;
private final InputConnection mPluginInputConnection;
public static GeckoEditableListener create(View targetView,
@ -200,27 +201,34 @@ class GeckoInputConnection
}
private void restartInput() {
if (mRestartInputRunnable != null) {
// Coalesce restartInput calls because InputMethodManager.restartInput()
// is expensive and successive calls to it can lock up the keyboard
long time = SystemClock.uptimeMillis();
if (time < mLastRestartInputTime + 200) {
return;
}
mLastRestartInputTime = time;
final InputMethodManager imm = getInputMethodManager();
if (imm == null) {
return;
}
mRestartInputRunnable = new Runnable() {
@Override
public void run() {
final View v = getView();
final Editable editable = getEditable();
// Fake a selection change, so that when we restart the input,
// the IME will make sure that any old composition string is cleared
notifySelectionChange(Selection.getSelectionStart(editable),
Selection.getSelectionEnd(editable));
imm.restartInput(v);
mRestartInputRunnable = null;
}
};
GeckoApp.mAppContext.mMainHandler.postDelayed(mRestartInputRunnable, 200);
final View v = getView();
// InputMethodManager has internal logic to detect if we are restarting input
// in an already focused View, which is the case here because all content text
// fields are inside one LayerView. When this happens, InputMethodManager will
// tell the input method to soft reset instead of hard reset. Stock latin IME
// on Android 4.2+ has a quirk that when it soft resets, it does not clear the
// composition. The following workaround tricks the IME into clearing the
// composition when soft resetting.
if (InputMethods.needsSoftResetWorkaround(mCurrentInputMethod)) {
// Fake a selection change, because the IME clears the composition when
// the selection changes, even if soft-resetting. Offsets here must be
// different from the previous selection offsets, and -1 seems to be a
// reasonable, deterministic value
notifySelectionChange(-1, -1);
}
imm.restartInput(v);
}
public void onTextChange(String text, int start, int oldEnd, int newEnd) {

7
mobile/android/base/InputMethods.java
View File

@ -22,6 +22,7 @@ final class InputMethods {
public static final String METHOD_IWNN = "jp.co.omronsoft.iwnnime.ml/.standardcommon.IWnnLanguageSwitcher";
public static final String METHOD_OPENWNN_PLUS = "com.owplus.ime.openwnnplus/.OpenWnnJAJP";
public static final String METHOD_SIMEJI = "com.adamrocker.android.input.simeji/.OpenWnnSimeji";
public static final String METHOD_STOCK_LATINIME = "com.google.android.inputmethod.latin/com.android.inputmethod.latin.LatinIME";
public static final String METHOD_SWYPE = "com.swype.android.inputmethod/.SwypeInputMethod";
public static final String METHOD_SWYPE_BETA = "com.nuance.swype.input/.IME";
@ -83,4 +84,10 @@ final class InputMethods {
// The locale may change while Firefox is running, but the device and OS should not. :)
return sIsPreJellyBeanAsusTransformer && !Locale.getDefault().equals(Locale.US);
}
public static boolean needsSoftResetWorkaround(String inputMethod) {
// Stock latin IME on Android 4.2 and above
return Build.VERSION.SDK_INT >= 17 &&
inputMethod.equals(METHOD_STOCK_LATINIME);
}
}