From c2779aef060137d9062cfd29babb3c43fc5fa2b5 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 27 Dec 2022 16:29:01 +0100 Subject: Android: Add the advanced input mapping dialog It's missing a lot of features from the PC version for now, like buttons for inserting functions and the ability to see what the expression evaluates to. I mostly just wanted to get something in place so you can set up rumble. Co-authored-by: Charles Lombardo --- Source/Android/jni/Input/MappingCommon.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Source/Android/jni/Input/MappingCommon.cpp') diff --git a/Source/Android/jni/Input/MappingCommon.cpp b/Source/Android/jni/Input/MappingCommon.cpp index 4e5d88ccf6..1cc55df2ae 100644 --- a/Source/Android/jni/Input/MappingCommon.cpp +++ b/Source/Android/jni/Input/MappingCommon.cpp @@ -53,6 +53,19 @@ Java_org_dolphinemu_dolphinemu_features_input_model_MappingCommon_detectInput( ciface::MappingCommon::Quote::On)); } +JNIEXPORT jstring JNICALL +Java_org_dolphinemu_dolphinemu_features_input_model_MappingCommon_getExpressionForControl( + JNIEnv* env, jclass, jstring j_control, jstring j_device, jstring j_default_device) +{ + ciface::Core::DeviceQualifier device_qualifier, default_device_qualifier; + device_qualifier.FromString(GetJString(env, j_device)); + default_device_qualifier.FromString(GetJString(env, j_default_device)); + + return ToJString(env, ciface::MappingCommon::GetExpressionForControl(GetJString(env, j_control), + device_qualifier, + default_device_qualifier)); +} + JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_input_model_MappingCommon_save(JNIEnv* env, jclass) { -- cgit v1.2.3