diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml index 2290b940df..5eae9e4445 100644 --- a/Source/Android/app/src/main/AndroidManifest.xml +++ b/Source/Android/app/src/main/AndroidManifest.xml @@ -64,10 +64,6 @@ android:name=".activities.EmulationActivity" android:theme="@style/DolphinEmulationGamecube"/> - - diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java index 5449dc8ee2..464d841277 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -288,13 +288,6 @@ public final class NativeLibrary */ public static native String GetVersionString(); - /** - * Returns if the phone supports NEON or not - * - * @return true if it supports NEON, false otherwise. - */ - public static native boolean SupportsNEON(); - /** * Saves a screen capture of the game */ @@ -359,21 +352,6 @@ public final class NativeLibrary */ public static native void WriteProfileResults(); - /** - * @return If we have an alert - */ - public static native boolean HasAlertMsg(); - - /** - * @return The alert string - */ - public static native String GetAlertMsg(); - - /** - * Clears event in the JNI so we can continue onward - */ - public static native void ClearAlertMsg(); - /** Native EGL functions not exposed by Java bindings **/ public static native void eglBindAPI(int api); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java index 6c75e55544..7f4421b101 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java @@ -121,7 +121,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener { if (isInEditMode()) { - return onTouchWhileEditing(v, event); + return onTouchWhileEditing(event); } int pointerIndex = event.getActionIndex(); @@ -209,7 +209,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener return true; } - public boolean onTouchWhileEditing(View v, MotionEvent event) + public boolean onTouchWhileEditing(MotionEvent event) { int pointerIndex = event.getActionIndex(); int fingerPositionX = (int)event.getX(pointerIndex); @@ -229,13 +229,13 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener if (mButtonBeingConfigured == null && button.getBounds().contains(fingerPositionX, fingerPositionY)) { mButtonBeingConfigured = button; - mButtonBeingConfigured.onConfigureTouch(v, event); + mButtonBeingConfigured.onConfigureTouch(event); } break; case MotionEvent.ACTION_MOVE: if (mButtonBeingConfigured != null) { - mButtonBeingConfigured.onConfigureTouch(v, event); + mButtonBeingConfigured.onConfigureTouch(event); invalidate(); return true; } @@ -264,13 +264,13 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener if (mButtonBeingConfigured == null && dpad.getBounds().contains(fingerPositionX, fingerPositionY)) { mDpadBeingConfigured = dpad; - mDpadBeingConfigured.onConfigureTouch(v, event); + mDpadBeingConfigured.onConfigureTouch(event); } break; case MotionEvent.ACTION_MOVE: if (mDpadBeingConfigured != null) { - mDpadBeingConfigured.onConfigureTouch(v, event); + mDpadBeingConfigured.onConfigureTouch(event); invalidate(); return true; } @@ -297,13 +297,13 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener if (mJoystickBeingConfigured == null && joystick.getBounds().contains(fingerPositionX, fingerPositionY)) { mJoystickBeingConfigured = joystick; - mJoystickBeingConfigured.onConfigureTouch(v, event); + mJoystickBeingConfigured.onConfigureTouch(event); } break; case MotionEvent.ACTION_MOVE: if (mJoystickBeingConfigured != null) { - mJoystickBeingConfigured.onConfigureTouch(v, event); + mJoystickBeingConfigured.onConfigureTouch(event); invalidate(); } break; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java index 8601756faa..7d692c36ba 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java @@ -47,7 +47,7 @@ public final class InputOverlayDrawableButton extends BitmapDrawable return mButtonType; } - public boolean onConfigureTouch(View v, MotionEvent event) + public boolean onConfigureTouch(MotionEvent event) { int pointerIndex = event.getActionIndex(); int fingerPositionX = (int)event.getX(pointerIndex); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java index e0ae7b6a52..56ee4b2e18 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java @@ -55,7 +55,7 @@ public final class InputOverlayDrawableDpad extends BitmapDrawable return mButtonType[direction]; } - public boolean onConfigureTouch(View v, MotionEvent event) + public boolean onConfigureTouch(MotionEvent event) { int pointerIndex = event.getActionIndex(); int fingerPositionX = (int)event.getX(pointerIndex); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java index 885d84cb11..65b63274ca 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java @@ -120,7 +120,7 @@ public final class InputOverlayDrawableJoystick extends BitmapDrawable } } - public boolean onConfigureTouch(View v, MotionEvent event) + public boolean onConfigureTouch(MotionEvent event) { int pointerIndex = event.getActionIndex(); int fingerPositionX = (int)event.getX(pointerIndex); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java index 3664fd6abf..bb690387dd 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java @@ -1,6 +1,5 @@ package org.dolphinemu.dolphinemu.utils; -import android.app.Activity; import android.app.PendingIntent; import android.content.Intent; import android.hardware.usb.UsbConfiguration; @@ -15,7 +14,6 @@ import org.dolphinemu.dolphinemu.services.USBPermService; import java.util.Arrays; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; public class Java_WiimoteAdapter diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java index 316315cf65..5f1675200a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java @@ -66,9 +66,7 @@ public final class SettingsFile public static final String KEY_SKIP_EFB = "EFBAccessEnable"; public static final String KEY_IGNORE_FORMAT = "EFBEmulateFormatChanges"; - public static final String KEY_EFB_COPY = "EFBCopyEnable"; public static final String KEY_EFB_TEXTURE = "EFBToTextureEnable"; - public static final String KEY_EFB_CACHE = "EFBCopyCacheEnable"; public static final String KEY_TEXCACHE_ACCURACY = "SafeTextureCacheColorSamples"; public static final String KEY_XFB = "UseXFB"; public static final String KEY_XFB_REAL = "UseRealXFB"; diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml index 8cd79aa198..d72c1fb010 100644 --- a/Source/Android/app/src/main/res/values/arrays.xml +++ b/Source/Android/app/src/main/res/values/arrays.xml @@ -34,15 +34,7 @@ - - "None" - "Nunchuk" - "Classic" - "Guitar" - "Drums" - "Turntable" - - + None Nunchuk Classic diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index 0f62d06dff..7072a9bfd4 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -4,71 +4,6 @@ Dolphin Emulator - - Open navigation drawer - Close navigation drawer - - - Build Revision - Supports OpenGL ES 3 - Supports NEON - General - CPU - GLES 2 - GLES 3 - OpenGL - - - CPU ABI 1 - CPU ABI 2 - CPU Info - CPU Type - CPU Features - Number of Cores - CPU Implementer - Hardware - Unknown (%1$d). Please report this number so it can be documented! - - - Current Dir: %1$s - Parent Directory - File Size: %1$s - - - - Clear game list - Do you want to clear the game list? - Game List - Browse Folder - Settings - About - File Size: %.2f GiB - File Size: %.2f MiB - - - Device Compatibility Warning - Your phone doesn\'t support NEON which makes it incapable of running Dolphin Mobile?\nDo you want to try anyway? - Your device has known buggy video drivers for OpenGL ES 3.\nDo you want to try anyway? - - - File clicked: %1$s - - - Enable Input Overlay - Disable Input Overlay - Are you sure you wish to exit this game? - - - Input - Input Overlay - Configure the onscreen input overlay. - Input Overlay Layout - Button layout for the input overlay. - Adjust the control size - Controller Bindings - GameCube Controllers - Wii Controllers (Wiimotes) - GameCube Controller 1 @@ -224,19 +159,10 @@ Crossfade Right - Interpreter - Cached Interpreter - JIT64 Recompiler - JITIL Recompiler - JIT ARM Recompiler - JIT ARM64 Recompiler - CPU CPU Core %s Dual Core Split workload to two CPU cores instead of one. Increases speed. - Fastmem - Uses potentially unsafe optimizations for memory access. Override Emulated CPU Clock Speed Higher values can make variable-framerate games run at a higher framerate, requiring a powerful device. Lower values make games run at a lower framerate, increasing emulation speed, but reducing the emulated console\'s performance. Emulated CPU Clock Speed @@ -248,10 +174,6 @@ - Video - Software Renderer - OpenGL ES - OpenGL Video Backend Select the API used for graphics rendering. Show FPS @@ -296,13 +218,8 @@ Texture Cache Texture Cache Accuracy The safer the selection, the less likely the emulator will be missing any texture updates from RAM. - Low - Medium - High External Frame Buffer Determines how the XFB will be emulated. - Virtual - Real Disable Destination Alpha Disables emulation of a hardware feature called destination alpha, which is used in many games for various effects. Fast Depth Calculation @@ -318,10 +235,6 @@ Disabled Other - - Dolphin New UI - - CPU Settings Video Settings @@ -337,13 +250,7 @@ Exit Without Saving Settings - CPU Settings - Input Settings Extension Bindings - Video Settings - Emulation Activity - OK - Cancel Take Screenshot diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 5e12fffa57..9bb81b8379 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -429,8 +429,6 @@ JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetPlatform( jstring jFilename); JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv* env, jobject obj); -JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SupportsNEON(JNIEnv* env, - jobject obj); JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenShot(JNIEnv* env, jobject obj); JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_eglBindAPI(JNIEnv* env, @@ -585,12 +583,6 @@ JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersio return env->NewStringUTF(scm_rev_str.c_str()); } -JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SupportsNEON(JNIEnv* env, - jobject obj) -{ - return cpu_info.bASIMD; -} - JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenShot(JNIEnv* env, jobject obj) {