From 9a0ce170d2ff1be7e979a9a6b330c09306691afe Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Tue, 20 Aug 2013 19:08:13 +0200 Subject: [PATCH] Re-enable the Pause keymapping on Android --- UI/EmuScreen.cpp | 4 ---- UI/GameSettingsScreen.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 875b3b8faf..9d47ecc338 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -202,13 +202,9 @@ void EmuScreen::onVKeyDown(int virtualKeyCode) { } break; - // On Android, this is take care of in update() using input.buttons & back - // Should get rid of that but not now. -#ifndef ANDROID case VIRTKEY_PAUSE: screenManager()->push(new GamePauseScreen(gamePath_)); break; -#endif case VIRTKEY_AXIS_X_MIN: case VIRTKEY_AXIS_X_MAX: diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index a04d5f346d..e9362003d0 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -366,7 +366,7 @@ void GameSettingsScreen::CreateViews() { #ifdef _WIN32 systemSettings->Add(new Choice(s->T("Change Nickname")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeNickname); #endif - systemSettings->Add(new Choice(s->T("System Language")))->OnClick.Handle(this, &GameSettingsScreen::OnLanguage); + systemSettings->Add(new Choice(s->T("System Language", "Language")))->OnClick.Handle(this, &GameSettingsScreen::OnLanguage); systemSettings->Add(new Choice(s->T("Developer Tools")))->OnClick.Handle(this, &GameSettingsScreen::OnDeveloperTools);