diff --git a/config.def.h b/config.def.h index f527f3de07..076b8ae828 100644 --- a/config.def.h +++ b/config.def.h @@ -620,10 +620,6 @@ static unsigned input_backtouch_enable = false; static unsigned input_backtouch_toggle = false; #endif -#ifdef ANDROID -static bool back_as_menu_toggle_enable = true; -#endif - static bool all_users_control_menu = false; #if defined(ANDROID) || defined(_WIN32) diff --git a/configuration.c b/configuration.c index 4695bc8a2a..f626e018ef 100644 --- a/configuration.c +++ b/configuration.c @@ -697,7 +697,6 @@ static int populate_settings_bool(settings_t *settings, struct config_bool_setti SETTING_BOOL("ui_companion_enable", &settings->ui.companion_enable, true, ui_companion_enable, false); SETTING_BOOL("video_gpu_record", &settings->video.gpu_record, true, gpu_record, false); SETTING_BOOL("input_remap_binds_enable", &settings->input.remap_binds_enable, true, true, false); - SETTING_BOOL("back_as_menu_toggle_enable", &settings->input.back_as_menu_toggle_enable, true, true, false); SETTING_BOOL("all_users_control_menu", &settings->input.all_users_control_menu, true, all_users_control_menu, false); SETTING_BOOL("menu_swap_ok_cancel_buttons", &settings->input.menu_swap_ok_cancel_buttons, true, menu_swap_ok_cancel_buttons, false); #ifdef HAVE_NETWORKING diff --git a/configuration.h b/configuration.h index 6d03dedc22..4191c4aeae 100644 --- a/configuration.h +++ b/configuration.h @@ -294,7 +294,6 @@ typedef struct settings bool input_descriptor_hide_unbound; unsigned menu_toggle_gamepad_combo; - bool back_as_menu_toggle_enable; bool all_users_control_menu; bool menu_swap_ok_cancel_buttons; diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 515f24023e..efdb84b4c7 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -924,10 +924,6 @@ static void handle_hotplug(android_input_data_t *android_data, name_buf, sizeof(settings->input.device_names[*port])); } - if (!back_mapped && settings->input.back_as_menu_toggle_enable) - settings->input.autoconf_binds[*port] - [RARCH_MENU_TOGGLE].joykey = AKEYCODE_BACK; - android_data->pad_states[android_data->pads_connected].id = id; android_data->pad_states[android_data->pads_connected].port = *port; strlcpy(android_data->pad_states[*port].name, name_buf, diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c index 319c720b43..16aad43f9b 100644 --- a/intl/msg_hash_chs.c +++ b/intl/msg_hash_chs.c @@ -2276,8 +2276,6 @@ static const char *menu_hash_to_str_chs_label_enum(enum msg_hash_enums msg) return "input_autodetect_enable"; case MENU_ENUM_LABEL_INPUT_AXIS_THRESHOLD: return "input_axis_threshold"; - case MENU_ENUM_LABEL_INPUT_BACK_AS_MENU_ENUM_TOGGLE_ENABLE: - return "back_as_menu_toggle_enable"; case MENU_ENUM_LABEL_INPUT_BIND_MODE: return "input_bind_mode"; case MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT: @@ -3361,8 +3359,6 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg) return "启用自动配置"; case MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD: return "输入轴阈值"; - case MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_ENUM_TOGGLE_ENABLE: - return "将返回作为菜单切出键"; case MENU_ENUM_LABEL_VALUE_INPUT_BIND_ALL: return "绑定全部"; case MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL: diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index 34290b518b..cc8da4497d 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -1298,8 +1298,6 @@ const char *msg_hash_to_str_es(enum msg_hash_enums msg) return "¿Qué es un núcleo?"; case MENU_ENUM_LABEL_VALUE_INFORMATION_LIST: return "Información"; - case MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_ENUM_TOGGLE_ENABLE: - return "Permitir alternar Back como menú"; case MENU_ENUM_LABEL_VALUE_INPUT_ICADE_ENABLE: return "Activar asignar mando al teclado"; case MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE: diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c index af27b24523..2a117d3317 100644 --- a/intl/msg_hash_it.c +++ b/intl/msg_hash_it.c @@ -1177,8 +1177,6 @@ const char *msg_hash_to_str_it(enum msg_hash_enums msg) return "Che cosa è un core?"; case MENU_ENUM_LABEL_VALUE_INFORMATION_LIST: return "Informazioni"; - case MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_TOGGLE_ENABLE: - return "Indietro quando il menù a comparsa è abilitato"; case MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE: return "Tipologia di mappatura gamepad tastiera"; case MENU_ENUM_LABEL_VALUE_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO: diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c index 370cb425d9..c6948a9d04 100644 --- a/intl/msg_hash_ja.c +++ b/intl/msg_hash_ja.c @@ -2306,8 +2306,6 @@ static const char *menu_hash_to_str_jp_label_enum(enum msg_hash_enums msg) return "input_autodetect_enable"; case MENU_ENUM_LABEL_INPUT_AXIS_THRESHOLD: return "input_axis_threshold"; - case MENU_ENUM_LABEL_INPUT_BACK_AS_MENU_ENUM_TOGGLE_ENABLE: - return "back_as_menu_toggle_enable"; case MENU_ENUM_LABEL_INPUT_BIND_MODE: return "input_bind_mode"; case MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT: @@ -3391,8 +3389,6 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg) return "自動コンフィグを有効"; case MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD: return "入力軸のしきい値"; - case MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_ENUM_TOGGLE_ENABLE: - return "Back As Menu Toggle Enable"; case MENU_ENUM_LABEL_VALUE_INPUT_BIND_ALL: return "全てをバインド"; case MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL: diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 6012342fdc..c10357eadc 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -414,8 +414,6 @@ MSG_HASH(MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE, "input_autodetect_enable") MSG_HASH(MENU_ENUM_LABEL_INPUT_AXIS_THRESHOLD, "input_axis_threshold") -MSG_HASH(MENU_ENUM_LABEL_INPUT_BACK_AS_MENU_ENUM_TOGGLE_ENABLE, - "back_as_menu_toggle_enable") MSG_HASH(MENU_ENUM_LABEL_INPUT_BIND_MODE, "input_bind_mode") MSG_HASH(MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT, diff --git a/intl/msg_hash_nl.c b/intl/msg_hash_nl.c index 39c5b3c3fe..fd55ce54e6 100644 --- a/intl/msg_hash_nl.c +++ b/intl/msg_hash_nl.c @@ -295,8 +295,6 @@ const char *msg_hash_to_str_nl(enum msg_hash_enums msg) return "Autoconfiguratie Activeren"; case MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD: return "Invoer As Threshold"; /* TODO/FIXME */ - case MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_TOGGLE_ENABLE: - return "Terug als Menu Schakelaar"; case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND: return "Verbergen Niet-gemapte Core Input Descripties"; case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW: diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 9d9a49a594..643905b0ae 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -614,8 +614,6 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD, "Analog Stick Deadzone") MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_INPUT_SWAP_OK_CANCEL, "Menu Swap Ok & Cancel Buttons") -MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_ENUM_TOGGLE_ENABLE, - "Back As Menu Toggle Enable") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_BIND_ALL, "Bind All") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL, diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c index 0621cd6f39..13a2288575 100644 --- a/intl/msg_hash_vn.c +++ b/intl/msg_hash_vn.c @@ -2308,8 +2308,6 @@ static const char *menu_hash_to_str_vn_label_enum(enum msg_hash_enums msg) return "input_autodetect_enable"; case MENU_ENUM_LABEL_INPUT_AXIS_THRESHOLD: return "input_axis_threshold"; - case MENU_ENUM_LABEL_INPUT_BACK_AS_MENU_ENUM_TOGGLE_ENABLE: - return "back_as_menu_toggle_enable"; case MENU_ENUM_LABEL_INPUT_BIND_MODE: return "input_bind_mode"; case MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT: @@ -3395,8 +3393,6 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg) return "Autoconfig Enable"; case MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD: return "Input Axis Threshold"; - case MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_ENUM_TOGGLE_ENABLE: - return "Back As Menu Toggle Enable"; case MENU_ENUM_LABEL_VALUE_INPUT_BIND_ALL: return "Bind All"; case MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL: diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 7269687bbc..ced83a4ecb 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3956,24 +3956,6 @@ static bool setting_append_list( ); #endif -#ifdef ANDROID - CONFIG_BOOL( - list, list_info, - &settings->input.back_as_menu_toggle_enable, - MENU_ENUM_LABEL_INPUT_BACK_AS_MENU_TOGGLE_ENABLE, - MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_TOGGLE_ENABLE, - back_as_menu_toggle_enable, - 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 - ); -#endif - CONFIG_UINT( list, list_info, &settings->input.menu_toggle_gamepad_combo, diff --git a/msg_hash.h b/msg_hash.h index 9fe280e3ad..0838a946b5 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -427,14 +427,11 @@ enum msg_hash_enums MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE_LAST = MENU_ENUM_LABEL_INPUT_LIBRETRO_DEVICE + MAX_USERS, MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE, MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE_LAST = MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE + MAX_USERS, - MENU_ENUM_LABEL_INPUT_BACK_AS_MENU_TOGGLE, - MENU_ENUM_LABEL_INPUT_BACK_AS_MENU_TOGGLE_ENABLE, MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS_BEGIN, MENU_ENUM_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE, MENU_ENUM_LABEL_INPUT_SETTINGS, MENU_ENUM_LABEL_INPUT_SETTINGS_BEGIN, MENU_ENUM_LABEL_INPUT_OVERLAY_HIDE_IN_MENU, - MENU_ENUM_LABEL_INPUT_BACK_AS_MENU_ENUM_TOGGLE_ENABLE, MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO, MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS, MENU_ENUM_LABEL_INPUT_OSK_OVERLAY_ENABLE, @@ -571,11 +568,9 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS, - MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_ENUM_TOGGLE_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO, MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU, MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE, - MENU_ENUM_LABEL_VALUE_INPUT_BACK_AS_MENU_TOGGLE_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_TOUCH_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_PREFER_FRONT_TOUCH,