diff --git a/shell/android/res/values-da/strings.xml b/shell/android/res/values-da/strings.xml index ecbac9a5c..e304eb153 100644 --- a/shell/android/res/values-da/strings.xml +++ b/shell/android/res/values-da/strings.xml @@ -62,11 +62,6 @@ Tilpas controller Tryk på den nye controller taste for %1$s - Tryk på %1$s knappen for en menu - tilbage - menu - R3 - MOGA Pro tilsluttet! MOGA tilsluttet! diff --git a/shell/android/res/values-ru/strings.xml b/shell/android/res/values-ru/strings.xml index a72ad6cc9..a3d52c9e6 100644 --- a/shell/android/res/values-ru/strings.xml +++ b/shell/android/res/values-ru/strings.xml @@ -55,11 +55,6 @@ Изменить контроллер Нажмите кнопку на контроллере для %1$s - - Нажмите на кнопку %1$s для выхода в меню - назад - поиск - MOGA Pro присоиденен! MOGA присоиденен! diff --git a/shell/android/res/values-zh-rCN/strings.xml b/shell/android/res/values-zh-rCN/strings.xml index 937d22986..a7c921264 100644 --- a/shell/android/res/values-zh-rCN/strings.xml +++ b/shell/android/res/values-zh-rCN/strings.xml @@ -47,9 +47,6 @@ 自定义物理控制 修改控制器 按下控制器按钮来映射 %1$s - 按 %1$s 来调出菜单 - 返回 - 搜寻 MOGA Pro已连接! MOGA已连接 reicast是一款dreamcast模拟器 diff --git a/shell/android/res/values-zh/strings.xml b/shell/android/res/values-zh/strings.xml index 7e19f883f..96cde9ecd 100644 --- a/shell/android/res/values-zh/strings.xml +++ b/shell/android/res/values-zh/strings.xml @@ -47,9 +47,6 @@ 自定義物理控制 修改控制器 按下控制器按鈕來映射 %1$s - 按 %1$s 來調出菜單 - 返回 - 搜尋 MOGA Pro已連接! MOGA已連接 reicast是一款dreamcast模擬器 diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml index 59ae482a2..748a3ad98 100644 --- a/shell/android/res/values/strings.xml +++ b/shell/android/res/values/strings.xml @@ -62,11 +62,6 @@ Modify Controller Press the new controller button for %1$s - Press the %1$s button for a menu - back / select - menu - R3 - MOGA Pro Connected! MOGA Connected! diff --git a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java index c3b462502..d9194efe2 100644 --- a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java +++ b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java @@ -186,18 +186,6 @@ public class GL2JNIActivity extends Activity { mView = new GL2JNIView(getApplication(), config, fileName, false, prefs.getInt("depth_render", 24), 0, false); setContentView(mView); - - String menu_spec; - if (pad.isXperiaPlay || pad.isOuyaOrTV) { - menu_spec = getApplicationContext().getString(R.string.menu_button); - } else { - menu_spec = getApplicationContext().getString(R.string.back_button); - } - Toast.makeText( - getApplicationContext(), - getApplicationContext() - .getString(R.string.bios_menu, menu_spec), - Toast.LENGTH_SHORT).show(); //setup mic boolean micPluggedIn = prefs.getBoolean("mic_plugged_in", false); diff --git a/shell/android/src/com/reicast/emulator/GL2JNINative.java b/shell/android/src/com/reicast/emulator/GL2JNINative.java index 0e8667682..6745ec520 100644 --- a/shell/android/src/com/reicast/emulator/GL2JNINative.java +++ b/shell/android/src/com/reicast/emulator/GL2JNINative.java @@ -204,18 +204,6 @@ public class GL2JNINative extends NativeActivity { mView = new GL2JNIView(getApplication(), config, fileName, false, prefs.getInt("depth_render", 24), 0, false); setContentView(mView); - - String menu_spec; - if (pad.isXperiaPlay || pad.isOuyaOrTV) { - menu_spec = getApplicationContext().getString(R.string.menu_button); - } else { - menu_spec = getApplicationContext().getString(R.string.back_button); - } - Toast.makeText( - getApplicationContext(), - getApplicationContext() - .getString(R.string.bios_menu, menu_spec), - Toast.LENGTH_SHORT).show(); //setup mic boolean micPluggedIn = prefs.getBoolean("mic_plugged_in", false); diff --git a/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java b/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java index 50f5be14a..b32b28e75 100644 --- a/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java +++ b/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java @@ -1,6 +1,7 @@ package com.reicast.emulator.emu; import java.io.File; +import java.util.ArrayList; import java.util.Vector; import android.app.Activity; @@ -192,6 +193,7 @@ public class OnScreenMenu { private View fastforward; private View fdown; private View fup; + ArrayList menuItems = new ArrayList(); public ConfigPopup(Context c) { super(c); @@ -203,11 +205,13 @@ public class OnScreenMenu { hlay.setOrientation(LinearLayout.HORIZONTAL); - hlay.addView(addbut(R.drawable.up, new OnClickListener() { + View up = addbut(R.drawable.up, new OnClickListener() { public void onClick(View v) { removePopUp(ConfigPopup.this); } - }), configParams); + }); + hlay.addView(up, configParams); + menuItems.add(up); fullscreen = addbut(R.drawable.widescreen, new OnClickListener() { public void onClick(View v) { @@ -230,6 +234,7 @@ public class OnScreenMenu { } hlay.addView(fullscreen, params); + menuItems.add(fullscreen); fdown = addbut(R.drawable.frames_down, new OnClickListener() { public void onClick(View v) { @@ -251,7 +256,9 @@ public class OnScreenMenu { }); hlay.addView(fdown, params); + menuItems.add(fdown); hlay.addView(fup, params); + menuItems.add(fup); enableState(fdown, fup); framelimit = addbut(R.drawable.frames_limit_on, @@ -275,6 +282,7 @@ public class OnScreenMenu { .setImageResource(R.drawable.frames_limit_off); } hlay.addView(framelimit, params); + menuItems.add(framelimit); audiosetting = addbut(R.drawable.enable_sound, new OnClickListener() { @@ -314,6 +322,7 @@ public class OnScreenMenu { audiosetting.setEnabled(false); } hlay.addView(audiosetting, params); + menuItems.add(audiosetting); fastforward = addbut(R.drawable.star, new OnClickListener() { public void onClick(View v) { @@ -372,17 +381,31 @@ public class OnScreenMenu { .setImageResource(R.drawable.reset); } hlay.addView(fastforward, params); + menuItems.add(fastforward); - hlay.addView(addbut(R.drawable.close, new OnClickListener() { + View close = addbut(R.drawable.close, new OnClickListener() { public void onClick(View v) { popups.remove(ConfigPopup.this); dismiss(); } - }), configParams); + }); + hlay.addView(close, configParams); + menuItems.add(close); setContentView(hlay); + getFocusedItem(); popups.add(this); } + + public void getFocusedItem() { + for (View menuItem : menuItems) { + if (menuItem.hasFocus()) { + // do something to the focused item + } else { + // do something to the rest of them + } + } + } } /**