mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8442 from bparker06/vibrate_on_keypress

Browse Source 
android: add option to vibrate on touch
This commit is contained in:
Twinaphex 2019-03-11 13:30:02 +01:00 committed by GitHub
commit fb6a403220
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 70 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -816,6 +816,8 @@ static const unsigned midi_volume = 100;
/* Only applies to Android 7.0 (API 24) and up */
static const bool sustained_performance_mode = false;
static const bool vibrate_on_keypress = false;
#if defined(HAKCHI)
static char buildbot_server_url[] = "http://hakchicloud.com/Libretro_Cores/";
#elif defined(ANDROID)

1
configuration.c
View File

@ -1584,6 +1584,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
SETTING_BOOL("playlist_sort_alphabetical", &settings->bools.playlist_sort_alphabetical, true, playlist_sort_alphabetical, false);
SETTING_BOOL("quit_press_twice", &settings->bools.quit_press_twice, true, quit_press_twice, false);
SETTING_BOOL("vibrate_on_keypress", &settings->bools.vibrate_on_keypress, true, vibrate_on_keypress, false);
*size = count;

1
configuration.h
View File

@ -315,6 +315,7 @@ typedef struct settings
bool playlist_show_sublabels;
bool quit_press_twice;
bool vibrate_on_keypress;
} bools;
struct

2
frontend/drivers/platform_unix.c
View File

@ -2036,6 +2036,8 @@ static void frontend_unix_init(void *data)
"setSustainedPerformanceMode", "(Z)V");
GET_METHOD_ID(env, android_app->setScreenOrientation, class,
"setScreenOrientation", "(I)V");
GET_METHOD_ID(env, android_app->doVibrate, class,
"doVibrate", "()V");
CALL_OBJ_METHOD(env, obj, android_app->activity->clazz,
android_app->getIntent);

5
frontend/drivers/platform_unix.h
View File

@ -163,6 +163,7 @@ struct android_app
jmethodID getBatteryLevel;
jmethodID setSustainedPerformanceMode;
jmethodID setScreenOrientation;
jmethodID doVibrate;
};
enum
@ -266,7 +267,9 @@ enum
*/
APP_CMD_DESTROY,
APP_CMD_REINIT_DONE
APP_CMD_REINIT_DONE,
APP_CMD_VIBRATE_KEYPRESS
};
#define JNI_EXCEPTION(env) \

13
input/drivers/android_input.c
View File

@ -421,6 +421,15 @@ static void android_input_poll_main_cmd(void)
RARCH_LOG("APP_CMD_DESTROY\n");
android_app->destroyRequested = 1;
break;
case APP_CMD_VIBRATE_KEYPRESS:
{
JNIEnv *env = (JNIEnv*)jni_thread_getenv();
if (env && g_android)
CALL_VOID_METHOD(env, g_android->activity->clazz,
g_android->doVibrate);
break;
}
}
}
@ -741,6 +750,10 @@ static INLINE int android_input_poll_event_type_motion(
else
{
int pointer_max = MIN(AMotionEvent_getPointerCount(event), MAX_TOUCH);
settings_t *settings = config_get_ptr();
if (settings && settings->bools.vibrate_on_keypress && action != AMOTION_EVENT_ACTION_MOVE)
android_app_write_cmd(g_android, APP_CMD_VIBRATE_KEYPRESS);
if(action == AMOTION_EVENT_ACTION_DOWN && ENABLE_TOUCH_SCREEN_MOUSE)
{

2
intl/msg_hash_lbl.h
View File

@ -1801,3 +1801,5 @@ MSG_HASH(MENU_ENUM_LABEL_PLAYLIST_SUBLABEL_RUNTIME_TYPE,
"playlist_sublabel_runtime_type")
MSG_HASH(MENU_ENUM_LABEL_HELP_SEND_DEBUG_INFO,
"help_send_debug_info")
MSG_HASH(MENU_ENUM_LABEL_VIBRATE_ON_KEYPRESS,
"vibrate_on_keypress")

4
intl/msg_hash_us.h
View File

@ -8414,3 +8414,7 @@ MSG_HASH(
MSG_PRESS_ONE_MORE_TIME_TO_SEND_DEBUG_INFO,
"Press one more time to submit diagnostic info to the RetroArch team."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_VIBRATE_ON_KEYPRESS,
"Vibrate on key press"
)

3
menu/menu_displaylist.c
View File

@ -7083,6 +7083,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist
ret = menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_QUIT_PRESS_TWICE,
PARSE_ONLY_BOOL, false);
ret = menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_VIBRATE_ON_KEYPRESS,
PARSE_ONLY_BOOL, false);
if (menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_INPUT_POLL_TYPE_BEHAVIOR,
PARSE_ONLY_UINT, false) == 0)

16
menu/menu_setting.c
View File

@ -6943,6 +6943,22 @@ static bool setting_append_list(
SD_FLAG_NONE
);
CONFIG_BOOL(
list, list_info,
&settings->bools.vibrate_on_keypress,
MENU_ENUM_LABEL_VIBRATE_ON_KEYPRESS,
MENU_ENUM_LABEL_VALUE_VIBRATE_ON_KEYPRESS,
vibrate_on_keypress,
MENU_ENUM_LABEL_VALUE_OFF,
MENU_ENUM_LABEL_VALUE_ON,
&group_info,
&subgroup_info,
parent_group,
general_write_handler,
general_read_handler,
SD_FLAG_NONE
);
CONFIG_UINT(
list, list_info,
&settings->uints.input_poll_type_behavior,

2
msg_hash.h
View File

@ -2306,6 +2306,8 @@ enum msg_hash_enums
MSG_PRESS_TWO_MORE_TIMES_TO_SEND_DEBUG_INFO,
MSG_PRESS_ONE_MORE_TIME_TO_SEND_DEBUG_INFO,
MENU_LABEL(VIBRATE_ON_KEYPRESS),
MSG_LAST
};

1
pkg/android/phoenix/AndroidManifest.xml
View File

@ -14,6 +14,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.VIBRATE" />
<application
android:allowBackup="true"

2
pkg/android/phoenix/project.properties
View File

@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-24
target=android-26
android.library.reference.1=libs/googleplay

14
pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java
View File

@ -8,12 +8,15 @@ import android.content.SharedPreferences;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
import android.media.AudioAttributes;
import android.view.Surface;
import android.view.WindowManager;
import android.app.UiModeManager;
import android.os.BatteryManager;
import android.os.Build;
import android.os.PowerManager;
import android.os.Vibrator;
import android.os.VibrationEffect;
import android.util.Log;
import java.util.concurrent.CountDownLatch;
@ -35,6 +38,17 @@ public class RetroActivityCommon extends RetroActivityLocation
public boolean sustainedPerformanceMode = true;
public int screenOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
public void doVibrate()
{
Vibrator vibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
if (Build.VERSION.SDK_INT >= 26) {
vibrator.vibrate(VibrationEffect.createOneShot(33, VibrationEffect.DEFAULT_AMPLITUDE), new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION).build());
}else{
vibrator.vibrate(33);
}
}
// Exiting cleanly from NDK seems to be nearly impossible.
// Have to use exit(0) to avoid weird things happening, even with runOnUiThread() approaches.
// Use a separate JNI function to explicitly trigger the readback.

1
pkg/android/phoenix64/AndroidManifest.xml
View File

@ -14,6 +14,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.VIBRATE" />
<application
android:allowBackup="true"

2
pkg/android/phoenix64/project.properties
View File

@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-24
target=android-26
android.library.reference.1=libs/googleplay

2
retroarch.cfg
View File

@ -904,3 +904,5 @@
# Keep track of how long each core+content has been running for over time
# content_runtime_log = false
# vibrate_on_keypress = false