eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-25 17:15:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

servoshell: Hook up Android software keyboard to embedder events. (#40009)

Browse Source 
This is the most basic integration possible. Current limitations
include:
* the done button doesn't trigger form submission/keyboard hiding
* IME events don't trigger inputs (ie. pressing and holding a letter to
get more options)

However, it is infinitely better than the current integration.

Testing: Manually tested in the Android emulator.
Fixes: #12127 (we can open more specific issues after this)

Signed-off-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
Josh Matthews
2025-10-20 09:57:04 -04:00
committed by GitHub
parent ed300f1101
commit 3a29c20fff
5 changed files with 160 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
support/android/apk/servoapp/src/main/java/org/servo/servoshell/MainActivity.java
View File

@@ -14,6 +14,7 @@ import android.os.Bundle;
import android.system.ErrnoException;
import android.system.Os;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
@@ -38,6 +39,7 @@ public class MainActivity extends Activity implements Servo.Client {
ImageButton mReloadButton;
ImageButton mStopButton;
EditText mUrlField;
boolean mUrlFieldIsFocused;
ProgressBar mProgressBar;
TextView mIdleText;
boolean mCanGoBack;
@@ -54,6 +56,7 @@ public class MainActivity extends Activity implements Servo.Client {
mReloadButton = findViewById(R.id.reloadbutton);
mStopButton = findViewById(R.id.stopbutton);
mUrlField = findViewById(R.id.urlfield);
mUrlFieldIsFocused = false;
mProgressBar = findViewById(R.id.progressbar);
mIdleText = findViewById(R.id.redrawing);
mCanGoBack = false;
@@ -105,11 +108,12 @@ public class MainActivity extends Activity implements Servo.Client {
return false;
});
mUrlField.setOnFocusChangeListener((v, hasFocus) -> {
if (v.getId() == R.id.urlfield && !hasFocus) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
assert imm != null;
imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
if (v.getId() == R.id.urlfield) {
mUrlFieldIsFocused = hasFocus;
if (!hasFocus) {
InputMethodManager imm = getSystemService(InputMethodManager.class);
imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
}
}
});
}
@@ -138,6 +142,34 @@ public class MainActivity extends Activity implements Servo.Client {
mServoView.stop();
}
@Override
public void onImeShow() {
InputMethodManager imm = getSystemService(InputMethodManager.class);
imm.showSoftInput(mServoView, InputMethodManager.SHOW_IMPLICIT);
}
@Override
public void onImeHide() {
InputMethodManager imm = getSystemService(InputMethodManager.class);
imm.hideSoftInputFromWindow(mServoView.getWindowToken(), InputMethodManager.SHOW_IMPLICIT);
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (mUrlFieldIsFocused) {
return true;
}
return mServoView.onKeyDown(keyCode, event);
}
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
if (mUrlFieldIsFocused) {
return true;
}
return mServoView.onKeyUp(keyCode, event);
}
@Override
public void onAlert(String message) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);

6
support/android/apk/servoview/src/main/java/org/servo/servoview/JNIServo.java
View File

@@ -43,6 +43,9 @@ public class JNIServo {
public native void scroll(int dx, int dy, int x, int y);
public native void keydown(int keycode, int unicode);
public native void keyup(int keycode, int unicode);
public native void touchDown(float x, float y, int pointer_id);
public native void touchMove(float x, float y, int pointer_id);
@@ -106,6 +109,9 @@ public class JNIServo {
void onShutdownComplete();
void onImeShow();
void onImeHide();
void onMediaSessionMetadata(String title, String artist, String album);
void onMediaSessionPlaybackStateChange(int state);

20
support/android/apk/servoview/src/main/java/org/servo/servoview/Servo.java
View File

@@ -6,6 +6,7 @@
package org.servo.servoview;
import android.app.Activity;
import android.view.KeyEvent;
import android.view.Surface;
import org.servo.servoview.JNIServo.ServoCoordinates;
@@ -111,6 +112,14 @@ public class Servo {
mRunCallback.inGLThread(() -> mJNI.scroll(dx, dy, x, y));
}
public void onKeyDown(int keyCode, KeyEvent event) {
mRunCallback.inGLThread(() -> mJNI.keydown(keyCode, event.getUnicodeChar()));
}
public void onKeyUp(int keyCode, KeyEvent event) {
mRunCallback.inGLThread(() -> mJNI.keyup(keyCode, event.getUnicodeChar()));
}
public void touchDown(float x, float y, int pointerId) {
mRunCallback.inGLThread(() -> mJNI.touchDown(x, y, pointerId));
}
@@ -175,6 +184,9 @@ public class Servo {
void onRedrawing(boolean redrawing);
void onImeShow();
void onImeHide();
void onMediaSessionMetadata(String title, String artist, String album);
void onMediaSessionPlaybackStateChange(int state);
@@ -234,6 +246,14 @@ public class Servo {
mShutdownComplete = true;
}
public void onImeShow() {
mRunCallback.inUIThread(() -> mClient.onImeShow());
}
public void onImeHide() {
mRunCallback.inUIThread(() -> mClient.onImeHide());
}
public void onAnimatingChanged(boolean animating) {
mRunCallback.inGLThread(() -> mGfxCb.animationStateChanged(animating));
}

11
support/android/apk/servoview/src/main/java/org/servo/servoview/ServoView.java
View File

@@ -13,6 +13,7 @@ import android.os.Handler;
import android.os.Looper;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Surface;
import android.view.SurfaceView;
import android.view.SurfaceHolder;
@@ -229,6 +230,16 @@ public class ServoView extends SurfaceView
}
}
public boolean onKeyDown(int keyCode, KeyEvent event) {
mServo.onKeyDown(keyCode, event);
return true;
}
public boolean onKeyUp(int keyCode, KeyEvent event) {
mServo.onKeyUp(keyCode, event);
return true;
}
public void scroll(int dx, int dy, int x, int y) {
mServo.scroll(dx, dy, x, y);
}