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

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;