Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

android: Rename the Android app to reflect servo.org ownership and servoshell (#32554)

Browse source 
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Martin Robinson 2024-06-24 17:39:57 +02:00 • committed by GitHub
parent 7d7574373b
commit 30dad2565f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 65 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

6
etc/run_in_headless_android_emulator.py
View file

@ -59,7 +59,7 @@ def main(avd_name, apk_path, *args):
json_params = shell_quote(json.dumps(args))
extra = "-e servoargs " + json_params
cmd = "am start " + extra + " org.mozilla.servo/org.mozilla.servo.MainActivity"
cmd = "am start " + extra + " org.servo.servoshell/org.servo.servoshell.MainActivity"
check_call(adb + ["shell", cmd], stdout=sys.stderr)
# Start showing logs as soon as the application starts,
@ -128,7 +128,7 @@ def check_call(*args, **kwargs):
def write_user_stylesheets(adb, args):
data_dir = "/sdcard/Android/data/org.mozilla.servo/files"
data_dir = "/sdcard/Android/data/org.servo.servoshell/files"
check_call(adb + ["shell", "mkdir -p %s" % data_dir])
for i, (pos, path) in enumerate(extract_args("--user-stylesheet", args)):
remote_path = "%s/user%s.css" % (data_dir, i)
@ -139,7 +139,7 @@ def write_user_stylesheets(adb, args):
def write_hosts_file(adb):
hosts_file = os.environ.get("HOST_FILE")
if hosts_file:
data_dir = "/sdcard/Android/data/org.mozilla.servo/files"
data_dir = "/sdcard/Android/data/org.servo.servoshell/files"
check_call(adb + ["shell", "mkdir -p %s" % data_dir])
remote_path = data_dir + "/android_hosts"
check_call(adb + ["push", hosts_file, remote_path], stdout=sys.stderr)

56
ports/servoshell/egl/android.rs
View file

@ -57,7 +57,7 @@ where
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_version<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_version<'local>(
mut env: JNIEnv<'local>,
_class: JClass<'local>,
) -> JString<'local> {
@ -67,7 +67,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_version<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_init<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_init<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
_activity: JObject<'local>,
@ -142,7 +142,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_init<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_setBatchMode<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_setBatchMode<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
batch: jboolean,
@ -152,7 +152,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_setBatchMode<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_requestShutdown<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_requestShutdown<'local>(
mut env: JNIEnv<'local>,
_class: JClass<'local>,
) {
@ -161,7 +161,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_requestShutdown<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_deinit<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_deinit<'local>(
_env: JNIEnv<'local>,
_class: JClass<'local>,
) {
@ -170,7 +170,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_deinit<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_resize<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_resize<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
coordinates: JObject<'local>,
@ -184,7 +184,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_resize<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_performUpdates<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_performUpdates<'local>(
mut env: JNIEnv<'local>,
_class: JClass<'local>,
) {
@ -193,7 +193,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_performUpdates<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_loadUri<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_loadUri<'local>(
mut env: JNIEnv<'local>,
_class: JClass<'local>,
url: JString<'local>,
@ -211,7 +211,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_loadUri<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_reload<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_reload<'local>(
mut env: JNIEnv<'local>,
_class: JClass<'local>,
) {
@ -220,7 +220,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_reload<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_stop<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_stop<'local>(
mut env: JNIEnv<'local>,
_class: JClass<'local>,
) {
@ -229,7 +229,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_stop<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_refresh<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_refresh<'local>(
mut env: JNIEnv<'local>,
_class: JClass<'local>,
) {
@ -238,7 +238,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_refresh<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_goBack<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_goBack<'local>(
mut env: JNIEnv<'local>,
_class: JClass<'local>,
) {
@ -247,7 +247,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_goBack<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_goForward<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_goForward<'local>(
mut env: JNIEnv<'local>,
_class: JClass<'local>,
) {
@ -256,7 +256,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_goForward<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_scrollStart<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_scrollStart<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
dx: jint,
@ -271,7 +271,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_scrollStart<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_scrollEnd<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_scrollEnd<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
dx: jint,
@ -286,7 +286,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_scrollEnd<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_scroll<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_scroll<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
dx: jint,
@ -301,7 +301,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_scroll<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_touchDown<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_touchDown<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
x: jfloat,
@ -313,7 +313,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_touchDown<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_touchUp<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_touchUp<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
x: jfloat,
@ -325,7 +325,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_touchUp<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_touchMove<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_touchMove<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
x: jfloat,
@ -337,7 +337,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_touchMove<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_touchCancel<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_touchCancel<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
x: jfloat,
@ -349,7 +349,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_touchCancel<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_pinchZoomStart<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_pinchZoomStart<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
factor: jfloat,
@ -363,7 +363,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_pinchZoomStart<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_pinchZoom<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_pinchZoom<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
factor: jfloat,
@ -375,7 +375,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_pinchZoom<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_pinchZoomEnd<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_pinchZoomEnd<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
factor: jfloat,
@ -389,7 +389,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_pinchZoomEnd<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_click<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_click<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
x: jfloat,
@ -400,7 +400,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_click<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_pauseCompositor<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_pauseCompositor<'local>(
mut env: JNIEnv,
_: JClass<'local>,
) {
@ -409,7 +409,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_pauseCompositor<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_resumeCompositor<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_resumeCompositor<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
surface: JObject<'local>,
@ -425,7 +425,7 @@ pub extern "C" fn Java_org_mozilla_servoview_JNIServo_resumeCompositor<'local>(
}
#[no_mangle]
pub extern "C" fn Java_org_mozilla_servoview_JNIServo_mediaSessionAction<'local>(
pub extern "C" fn Java_org_servo_servoview_JNIServo_mediaSessionAction<'local>(
mut env: JNIEnv<'local>,
_: JClass<'local>,
action: jint,
@ -901,7 +901,7 @@ fn get_options<'local>(
env,
opts,
"coordinates",
"Lorg/mozilla/servoview/JNIServo$ServoCoordinates;",
"Lorg/servo/servoview/JNIServo$ServoCoordinates;",
)?
.l()
.map_err(|_| "coordinates is not an object")?;

2
python/servo/devenv_commands.py
View file

@ -268,7 +268,7 @@ class MachCommands(CommandBase):
ndk_gdb,
"--adb", adb_path,
"--project", "support/android/apk/servoapp/src/main/",
"--launch", "org.mozilla.servo.MainActivity",
"--launch", "org.servo.servoshell.MainActivity",
"-x", f.name,
"--verbose",
], env=env)

4
python/servo/package_commands.py
View file

@ -54,8 +54,8 @@ PACKAGES = {
'production/servo-tech-demo.dmg',
],
'maven': [
'android/gradle/servoview/maven/org/mozilla/servoview/servoview-armv7/',
'android/gradle/servoview/maven/org/mozilla/servoview/servoview-x86/',
'android/gradle/servoview/maven/org/servo/servoview/servoview-armv7/',
'android/gradle/servoview/maven/org/servo/servoview/servoview-x86/',
],
'windows-msvc': [
r'production\msi\Servo.exe',

8
python/servo/post_build_commands.py
View file

@ -104,7 +104,7 @@ class PostBuildCommands(CommandBase):
print("https://github.com/servo/servo/wiki/Building-for-Android#debugging-on-device")
return
script = [
"am force-stop org.mozilla.servo",
"am force-stop org.servo.servoshell",
]
json_params = shell_quote(json.dumps(params))
extra = "-e servoargs " + json_params
@ -115,10 +115,10 @@ class PostBuildCommands(CommandBase):
if gst_debug:
extra += " -e gstdebug " + gst_debug
script += [
"am start " + extra + " org.mozilla.servo/org.mozilla.servo.MainActivity",
"am start " + extra + " org.servo.servoshell/org.servo.servoshell.MainActivity",
"sleep 0.5",
"echo Servo PID: $(pidof org.mozilla.servo)",
"logcat --pid=$(pidof org.mozilla.servo)",
"echo Servo PID: $(pidof org.servo.servoshell)",
"logcat --pid=$(pidof org.servo.sevoshell)",
"exit"
]
args = [self.android_adb_path(env)]

4
support/android/apk/servoapp/build.gradle
View file

@ -9,12 +9,12 @@ android {
compileSdk 33
buildToolsVersion = "33.0.2"
namespace 'org.mozilla.servo'
namespace 'org.servo.servoshell'
buildDir = rootDir.absolutePath + "/../../../target/android/gradle/servoapp"
defaultConfig {
applicationId "org.mozilla.servo"
applicationId "org.servo.servoshell"
minSdk 30
targetSdk 30
versionCode 1

6
support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java → support/android/apk/servoapp/src/main/java/org/servo/servoshell/MainActivity.java
View file

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
package org.mozilla.servo;
package org.servo.servoshell;
import android.app.Activity;
import android.app.AlertDialog;
@ -22,8 +22,8 @@ import android.widget.EditText;
import android.widget.ProgressBar;
import android.widget.TextView;
import org.mozilla.servoview.Servo;
import org.mozilla.servoview.ServoView;
import org.servo.servoview.Servo;
import org.servo.servoview.ServoView;
import java.io.File;

16
support/android/apk/servoapp/src/main/java/org/mozilla/servo/MediaSession.java → support/android/apk/servoapp/src/main/java/org/servo/servoshell/MediaSession.java
View file

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
package org.mozilla.servo;
package org.servo.servoshell;
import android.app.Notification;
import android.app.NotificationChannel;
@ -16,7 +16,7 @@ import android.content.IntentFilter;
import android.os.Build;
import android.util.Log;
import org.mozilla.servoview.ServoView;
import org.servo.servoview.ServoView;
public class MediaSession {
private class NotificationID {
@ -48,11 +48,11 @@ public class MediaSession {
private static final int ACTION_SEEK_TO = 9;
private static final String MEDIA_CHANNEL_ID = "MediaNotificationChannel";
private static final String KEY_MEDIA_PLAY = "org.mozilla.servoview.MainActivity.play";
private static final String KEY_MEDIA_PAUSE = "org.mozilla.servoview.MainActivity.pause";
private static final String KEY_MEDIA_PREV = "org.mozilla.servoview.MainActivity.prev";
private static final String KEY_MEDIA_NEXT = "org.mozilla.servoview.MainActivity.next";
private static final String KEY_MEDIA_STOP = "org.mozilla.servoview.MainActivity.stop";
private static final String KEY_MEDIA_PLAY = "org.servo.servoview.MainActivity.play";
private static final String KEY_MEDIA_PAUSE = "org.servo.servoview.MainActivity.pause";
private static final String KEY_MEDIA_PREV = "org.servo.servoview.MainActivity.prev";
private static final String KEY_MEDIA_NEXT = "org.servo.servoview.MainActivity.next";
private static final String KEY_MEDIA_STOP = "org.servo.servoview.MainActivity.stop";
ServoView mView;
MainActivity mActivity;
@ -195,4 +195,4 @@ public class MediaSession {
// Not implemented
// see https://github.com/servo/servo/pull/24885#discussion_r352496117
public void setPositionState(float duration, float position, float playbackRate) {}
}
}

4
support/android/apk/servoapp/src/main/res/layout/activity_main.xml
View file

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.mozilla.servo.MainActivity">
tools:context="org.servo.servoshell.MainActivity">
<LinearLayout
android:layout_width="0dp"
@ -95,7 +95,7 @@
</LinearLayout>
<org.mozilla.servoview.ServoView
<org.servo.servoview.ServoView
android:id="@+id/servoview"
android:layout_width="match_parent"
android:layout_height="match_parent"

2
support/android/apk/servoview/build.gradle
View file

@ -10,7 +10,7 @@ android {
compileSdk 33
buildToolsVersion = "33.0.2"
namespace 'org.mozilla.servoview'
namespace 'org.servo.servoview'
buildDir = rootDir.absolutePath + "/../../../target/android/gradle/servoview"

4
support/android/apk/servoview/src/main/java/org/mozilla/servoview/JNIServo.java → support/android/apk/servoview/src/main/java/org/servo/servoview/JNIServo.java
View file

@ -3,12 +3,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
package org.mozilla.servoview;
package org.servo.servoview;
import android.app.Activity;
import android.view.Surface;
/**
* Maps /ports/libservoshell API
* Maps /ports/servoshell API
*/
@SuppressWarnings("JniMissingFunction")
public class JNIServo {

6
support/android/apk/servoview/src/main/java/org/mozilla/servoview/Servo.java → support/android/apk/servoview/src/main/java/org/servo/servoview/Servo.java
View file

@ -3,13 +3,13 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
package org.mozilla.servoview;
package org.servo.servoview;
import android.app.Activity;
import android.view.Surface;
import org.mozilla.servoview.JNIServo.ServoCoordinates;
import org.mozilla.servoview.JNIServo.ServoOptions;
import org.servo.servoview.JNIServo.ServoCoordinates;
import org.servo.servoview.JNIServo.ServoOptions;
import java.util.concurrent.Callable;
import java.util.concurrent.FutureTask;

12
support/android/apk/servoview/src/main/java/org/mozilla/servoview/ServoView.java → support/android/apk/servoview/src/main/java/org/servo/servoview/ServoView.java
View file

@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
package org.mozilla.servoview;
package org.servo.servoview;
import android.app.Activity;
import android.content.Context;
@ -17,11 +17,11 @@ import android.view.Surface;
import android.view.SurfaceView;
import android.view.SurfaceHolder;
import org.mozilla.servoview.JNIServo.ServoCoordinates;
import org.mozilla.servoview.JNIServo.ServoOptions;
import org.mozilla.servoview.Servo.Client;
import org.mozilla.servoview.Servo.GfxCallbacks;
import org.mozilla.servoview.Servo.RunCallback;
import org.servo.servoview.JNIServo.ServoCoordinates;
import org.servo.servoview.JNIServo.ServoOptions;
import org.servo.servoview.Servo.Client;
import org.servo.servoview.Servo.GfxCallbacks;
import org.servo.servoview.Servo.RunCallback;
import android.view.Choreographer;
import android.view.GestureDetector;