From 8b1a2fe8603b4124aea6f72a699a653389aca6c6 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Sun, 17 Oct 2021 23:47:59 +0200 Subject: [PATCH] backout SDL_AndroidSetInputType() --- .../main/java/org/libsdl/app/SDLActivity.java | 19 +------------------ include/SDL_system.h | 11 ----------- src/core/android/SDL_android.c | 11 ----------- src/dynapi/SDL_dynapi_overrides.h | 1 - src/dynapi/SDL_dynapi_procs.h | 3 --- 5 files changed, 1 insertion(+), 44 deletions(-) diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java index df42416d5..f850b0a60 100644 --- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java +++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java @@ -102,8 +102,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh /** If shared libraries (e.g. SDL or the native application) could not be loaded. */ public static boolean mBrokenLibraries = true; - public static int mInputType = 1; - // Main components protected static SDLActivity mSingleton; protected static SDLSurface mSurface; @@ -1186,14 +1184,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh return event.isPrintingKey() || event.getKeyCode() == KeyEvent.KEYCODE_SPACE; } - /** - * This method is called by SDL using JNI. - */ - public static int setInputType(int type) { - mInputType = type; - return 0; - } - /** * This method is called by SDL using JNI. */ @@ -2192,14 +2182,7 @@ class DummyEdit extends View implements View.OnKeyListener { public InputConnection onCreateInputConnection(EditorInfo outAttrs) { ic = new SDLInputConnection(this, true); - if (SDLActivity.mInputType == 0) { - /* 0 normal: use input method */ - outAttrs.inputType = InputType.TYPE_CLASS_TEXT; - } else { - /* 1 password (default): can not use input method，just use english */ - outAttrs.inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD; - } - + outAttrs.inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD; outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI | EditorInfo.IME_FLAG_NO_FULLSCREEN /* API 11 */; diff --git a/include/SDL_system.h b/include/SDL_system.h index 52ec56f35..433d0bf87 100644 --- a/include/SDL_system.h +++ b/include/SDL_system.h @@ -395,17 +395,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_AndroidRequestPermission(const char *permis */ extern DECLSPEC int SDLCALL SDL_AndroidShowToast(const char* message, int duration, int gravity, int xoffset, int yoffset); -/* Set Android IME Input Type - * Call this method before calling SDL_StartTextInput() - * - * \param type - * 0 normal: use input method - * 1 password (default): can not use input method，just use english - * - * \returns 0 if success, -1 if any error occurs. - */ -extern DECLSPEC int SDLCALL SDL_AndroidSetInputType(int type); - #endif /* __ANDROID__ */ /* Platform specific functions for WinRT */ diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c index 88e028de8..47e1ed657 100644 --- a/src/core/android/SDL_android.c +++ b/src/core/android/SDL_android.c @@ -316,7 +316,6 @@ static jmethodID midShowToast; static jmethodID midSendMessage; static jmethodID midSetActivityTitle; static jmethodID midSetCustomCursor; -static jmethodID midSetInputType; static jmethodID midSetOrientation; static jmethodID midSetRelativeMouseEnabled; static jmethodID midSetSystemCursor; @@ -596,7 +595,6 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *env, jclass cl midSendMessage = (*env)->GetStaticMethodID(env, mActivityClass, "sendMessage", "(II)Z"); midSetActivityTitle = (*env)->GetStaticMethodID(env, mActivityClass, "setActivityTitle","(Ljava/lang/String;)Z"); midSetCustomCursor = (*env)->GetStaticMethodID(env, mActivityClass, "setCustomCursor", "(I)Z"); - midSetInputType = (*env)->GetStaticMethodID(env, mActivityClass, "setInputType", "(I)I"); midSetOrientation = (*env)->GetStaticMethodID(env, mActivityClass, "setOrientation","(IIZLjava/lang/String;)V"); midSetRelativeMouseEnabled = (*env)->GetStaticMethodID(env, mActivityClass, "setRelativeMouseEnabled", "(Z)Z"); midSetSystemCursor = (*env)->GetStaticMethodID(env, mActivityClass, "setSystemCursor", "(I)Z"); @@ -627,7 +625,6 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *env, jclass cl !midSendMessage || !midSetActivityTitle || !midSetCustomCursor || - !midSetInputType || !midSetOrientation || !midSetRelativeMouseEnabled || !midSetSystemCursor || @@ -2456,14 +2453,6 @@ int SDL_AndroidShowToast(const char* message, int duration, int gravity, int xOf return Android_JNI_ShowToast(message, duration, gravity, xOffset, yOffset); } -int SDL_AndroidSetInputType(int type) -{ - int result = 0; - JNIEnv *env = Android_JNI_GetEnv(); - result = (*env)->CallStaticIntMethod(env, mActivityClass, midSetInputType, type); - return result; -} - void Android_JNI_GetManifestEnvironmentVariables(void) { if (!mActivityClass || !midGetManifestEnvironmentVariables) { diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h index 947a34f2f..77f434729 100644 --- a/src/dynapi/SDL_dynapi_overrides.h +++ b/src/dynapi/SDL_dynapi_overrides.h @@ -822,4 +822,3 @@ #define SDL_RenderSetVSync SDL_RenderSetVSync_REAL #define SDL_asprintf SDL_asprintf_REAL #define SDL_vasprintf SDL_vasprintf_REAL -#define SDL_AndroidSetInputType SDL_AndroidSetInputType_REAL diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h index 28623e209..c383ea675 100644 --- a/src/dynapi/SDL_dynapi_procs.h +++ b/src/dynapi/SDL_dynapi_procs.h @@ -889,6 +889,3 @@ SDL_DYNAPI_PROC(int,SDL_RenderSetVSync,(SDL_Renderer *a, int b),(a,b),return) SDL_DYNAPI_PROC(int,SDL_asprintf,(char **a, SDL_PRINTF_FORMAT_STRING const char *b, ...),(a,b),return) #endif SDL_DYNAPI_PROC(int,SDL_vasprintf,(char **a, const char *b, va_list c),(a,b,c),return) -#ifdef __ANDROID__ -SDL_DYNAPI_PROC(int,SDL_AndroidSetInputType,(int a),(a),return) -#endif