зеркало из https://github.com/mozilla/gecko-dev.git
Bug 772252 - Remove special casing of ALT key codes that broke ALT locking. r=blassey
This commit is contained in:
Родитель
33e8bb6ab0
Коммит
60b08f3f09
|
@ -531,9 +531,9 @@ class GeckoInputConnection
|
|||
// Such string cannot be handled by Gecko, so we convert it to a key press instead
|
||||
if (changedChar == '\n') {
|
||||
processKeyDown(KeyEvent.KEYCODE_ENTER, new KeyEvent(KeyEvent.ACTION_DOWN,
|
||||
KeyEvent.KEYCODE_ENTER), false);
|
||||
KeyEvent.KEYCODE_ENTER));
|
||||
processKeyUp(KeyEvent.KEYCODE_ENTER, new KeyEvent(KeyEvent.ACTION_UP,
|
||||
KeyEvent.KEYCODE_ENTER), false);
|
||||
KeyEvent.KEYCODE_ENTER));
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -855,9 +855,9 @@ class GeckoInputConnection
|
|||
public boolean onKeyPreIme(int keyCode, KeyEvent event) {
|
||||
switch (event.getAction()) {
|
||||
case KeyEvent.ACTION_DOWN:
|
||||
return processKeyDown(keyCode, event, true);
|
||||
return processKeyDown(keyCode, event);
|
||||
case KeyEvent.ACTION_UP:
|
||||
return processKeyUp(keyCode, event, true);
|
||||
return processKeyUp(keyCode, event);
|
||||
case KeyEvent.ACTION_MULTIPLE:
|
||||
return onKeyMultiple(keyCode, event.getRepeatCount(), event);
|
||||
}
|
||||
|
@ -865,13 +865,12 @@ class GeckoInputConnection
|
|||
}
|
||||
|
||||
public boolean onKeyDown(int keyCode, KeyEvent event) {
|
||||
return processKeyDown(keyCode, event, false);
|
||||
return processKeyDown(keyCode, event);
|
||||
}
|
||||
|
||||
private boolean processKeyDown(int keyCode, KeyEvent event, boolean isPreIme) {
|
||||
private boolean processKeyDown(int keyCode, KeyEvent event) {
|
||||
if (DEBUG) {
|
||||
Log.d(LOGTAG, "IME: processKeyDown(keyCode=" + keyCode + ", event=" + event + ", "
|
||||
+ isPreIme + ")");
|
||||
Log.d(LOGTAG, "IME: processKeyDown(keyCode=" + keyCode + ", event=" + event + ")");
|
||||
GeckoApp.assertOnUiThread();
|
||||
}
|
||||
|
||||
|
@ -900,11 +899,6 @@ class GeckoInputConnection
|
|||
break;
|
||||
}
|
||||
|
||||
if (isPreIme && mIMEState != IME_STATE_DISABLED &&
|
||||
(event.getMetaState() & KeyEvent.META_ALT_ON) != 0)
|
||||
// Let active IME process pre-IME key events
|
||||
return false;
|
||||
|
||||
View view = getView();
|
||||
KeyListener keyListener = TextKeyListener.getInstance();
|
||||
|
||||
|
@ -926,13 +920,12 @@ class GeckoInputConnection
|
|||
}
|
||||
|
||||
public boolean onKeyUp(int keyCode, KeyEvent event) {
|
||||
return processKeyUp(keyCode, event, false);
|
||||
return processKeyUp(keyCode, event);
|
||||
}
|
||||
|
||||
private boolean processKeyUp(int keyCode, KeyEvent event, boolean isPreIme) {
|
||||
private boolean processKeyUp(int keyCode, KeyEvent event) {
|
||||
if (DEBUG) {
|
||||
Log.d(LOGTAG, "IME: processKeyUp(keyCode=" + keyCode + ", event=" + event + ", "
|
||||
+ isPreIme + ")");
|
||||
Log.d(LOGTAG, "IME: processKeyUp(keyCode=" + keyCode + ", event=" + event + ")");
|
||||
GeckoApp.assertOnUiThread();
|
||||
}
|
||||
|
||||
|
@ -948,11 +941,6 @@ class GeckoInputConnection
|
|||
break;
|
||||
}
|
||||
|
||||
if (isPreIme && mIMEState != IME_STATE_DISABLED &&
|
||||
(event.getMetaState() & KeyEvent.META_ALT_ON) != 0)
|
||||
// Let active IME process pre-IME key events
|
||||
return false;
|
||||
|
||||
View view = getView();
|
||||
KeyListener keyListener = TextKeyListener.getInstance();
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче