diff --git a/android/README.md b/android/README.md index 5c3688d..82080c4 100644 --- a/android/README.md +++ b/android/README.md @@ -67,7 +67,6 @@ Note: This ZIP format is also compatible with ### Miscellaneous - You can export or import save files via the game list's option menu. - To uninstall a game, long-tap its title in the game list. -- A system menu will appear when you use a three-finger touch during gameplay. ## Known Issues - Installing from a ZIP file containing multiple games (e.g., the DPS series) diff --git a/android/app/src/main/java/io/github/kichikuou/system3/GameActivity.kt b/android/app/src/main/java/io/github/kichikuou/system3/GameActivity.kt index 9f44c50..8f08ffd 100644 --- a/android/app/src/main/java/io/github/kichikuou/system3/GameActivity.kt +++ b/android/app/src/main/java/io/github/kichikuou/system3/GameActivity.kt @@ -20,10 +20,6 @@ package io.github.kichikuou.system3 import android.app.AlertDialog import android.os.Bundle import android.text.InputType -import android.view.ContextMenu -import android.view.Menu -import android.view.MenuItem -import android.view.View import android.widget.EditText import org.libsdl.app.SDLActivity import java.io.File @@ -42,7 +38,6 @@ class GameActivity : SDLActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) gameRoot = File(intent.getStringExtra(EXTRA_GAME_ROOT)!!) - registerForContextMenu(mLayout) } override fun getLibraries(): Array { @@ -86,34 +81,6 @@ class GameActivity : SDLActivity() { .show() } - private var menuShown = false - private fun openMenu() { - if (menuShown) - return - openContextMenu(mLayout) - menuShown = true - } - - override fun onCreateContextMenu(menu: ContextMenu, v: View?, menuInfo: ContextMenu.ContextMenuInfo?) { - super.onCreateContextMenu(menu, v, menuInfo) - menuInflater.inflate(R.menu.game_menu, menu) - } - - override fun onContextItemSelected(item: MenuItem): Boolean { - return when (item.itemId) { - R.id.quit_game -> { - finish() - true - } - else -> super.onOptionsItemSelected(item) - } - } - - override fun onContextMenuClosed(menu: Menu) { - super.onContextMenuClosed(menu) - menuShown = false - } - // The functions below are called in the SDL thread by JNI. @Suppress("unused") fun inputString(oldVal: String, maxLen: Int): String? { val result = arrayOfNulls(1) @@ -128,8 +95,4 @@ class GameActivity : SDLActivity() { } return result[0] } - - @Suppress("unused") fun popupMenu() { - runOnUiThread { openMenu() } - } } diff --git a/android/app/src/main/res/menu/game_menu.xml b/android/app/src/main/res/menu/game_menu.xml deleted file mode 100644 index 40698c6..0000000 --- a/android/app/src/main/res/menu/game_menu.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml index 680e033..3b596a0 100644 --- a/android/app/src/main/res/values-ja/strings.xml +++ b/android/app/src/main/res/values-ja/strings.xml @@ -4,7 +4,6 @@ セーブデータをエクスポート セーブデータをインポート オープンソースライセンス - ゲーム終了 キャンセル System3 のファイル (*.dat) が見つかりません。 ファイルを選択 diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index a3d8f49..4387b3e 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -3,7 +3,6 @@ Export Save Files Import Save Files Open source licenses - Quit Game Cancel Cannot find System3 game files (*.dat). Choose a file diff --git a/src/android/nact_android.cpp b/src/android/nact_android.cpp index 66a6007..1cfd50f 100644 --- a/src/android/nact_android.cpp +++ b/src/android/nact_android.cpp @@ -51,13 +51,5 @@ void NACT::set_skip_menu_state(bool enabled, bool checked) bool NACT::handle_platform_event(const SDL_Event& e) { - if (e.type == SDL_FINGERDOWN && SDL_GetNumTouchFingers(e.tfinger.touchId) == 3) { - JNILocalFrame jni(16); - if (jni.env()) { - jmethodID mid = jni.GetMethodID("popupMenu", "()V"); - jni.env()->CallVoidMethod(jni.context(), mid); - return true; - } - } return false; }