diff --git a/android/bin/classes/com/retroarch/MainActivity.class b/android/bin/classes/com/retroarch/MainActivity.class index 377b626eae..33f0134ca2 100644 Binary files a/android/bin/classes/com/retroarch/MainActivity.class and b/android/bin/classes/com/retroarch/MainActivity.class differ diff --git a/android/bin/classes/com/retroarch/R$drawable.class b/android/bin/classes/com/retroarch/R$drawable.class index 6b99c19c15..9cf4ba1bc2 100644 Binary files a/android/bin/classes/com/retroarch/R$drawable.class and b/android/bin/classes/com/retroarch/R$drawable.class differ diff --git a/android/bin/classes/com/retroarch/R$layout.class b/android/bin/classes/com/retroarch/R$layout.class index fae0fa84b3..9feb438dea 100644 Binary files a/android/bin/classes/com/retroarch/R$layout.class and b/android/bin/classes/com/retroarch/R$layout.class differ diff --git a/android/bin/classes/com/retroarch/R$string.class b/android/bin/classes/com/retroarch/R$string.class index 2b74c5aebc..9838af76c9 100644 Binary files a/android/bin/classes/com/retroarch/R$string.class and b/android/bin/classes/com/retroarch/R$string.class differ diff --git a/android/bin/classes/com/retroarch/R.class b/android/bin/classes/com/retroarch/R.class index 83ec258ebb..5f0f1bbb20 100644 Binary files a/android/bin/classes/com/retroarch/R.class and b/android/bin/classes/com/retroarch/R.class differ diff --git a/android/gen/com/retroarch/R.java b/android/gen/com/retroarch/R.java index 2b02953f09..4b7bc1bc03 100644 --- a/android/gen/com/retroarch/R.java +++ b/android/gen/com/retroarch/R.java @@ -11,11 +11,28 @@ public final class R { public static final class attr { } public static final class drawable { - public static final int ic_launcher=0x7f020000; + public static final int ic_action_close=0x7f020000; + public static final int ic_action_history=0x7f020001; + public static final int ic_action_load=0x7f020002; + public static final int ic_action_open=0x7f020003; + public static final int ic_action_save=0x7f020004; + public static final int ic_action_settings=0x7f020005; + public static final int ic_launcher=0x7f020006; + } + public static final class id { + public static final int close=0x7f060003; + public static final int history=0x7f060004; + public static final int load=0x7f060001; + public static final int open=0x7f060000; + public static final int save=0x7f060002; + public static final int settings=0x7f060005; } public static final class layout { public static final int main=0x7f030000; } + public static final class menu { + public static final int main_menu=0x7f050000; + } public static final class string { public static final int app_name=0x7f040001; public static final int hello=0x7f040000; diff --git a/android/res/drawable-hdpi/ic_action_close.png b/android/res/drawable-hdpi/ic_action_close.png new file mode 100644 index 0000000000..1c74f6df01 Binary files /dev/null and b/android/res/drawable-hdpi/ic_action_close.png differ diff --git a/android/res/drawable-hdpi/ic_action_history.png b/android/res/drawable-hdpi/ic_action_history.png new file mode 100644 index 0000000000..0d324e3cd0 Binary files /dev/null and b/android/res/drawable-hdpi/ic_action_history.png differ diff --git a/android/res/drawable-hdpi/ic_action_load.png b/android/res/drawable-hdpi/ic_action_load.png new file mode 100644 index 0000000000..3ef03ab59a Binary files /dev/null and b/android/res/drawable-hdpi/ic_action_load.png differ diff --git a/android/res/drawable-hdpi/ic_action_open.png b/android/res/drawable-hdpi/ic_action_open.png new file mode 100644 index 0000000000..41233c5e00 Binary files /dev/null and b/android/res/drawable-hdpi/ic_action_open.png differ diff --git a/android/res/drawable-hdpi/ic_action_save.png b/android/res/drawable-hdpi/ic_action_save.png new file mode 100644 index 0000000000..dbc044c9d8 Binary files /dev/null and b/android/res/drawable-hdpi/ic_action_save.png differ diff --git a/android/res/drawable-hdpi/ic_action_settings.png b/android/res/drawable-hdpi/ic_action_settings.png new file mode 100644 index 0000000000..c73c92ec96 Binary files /dev/null and b/android/res/drawable-hdpi/ic_action_settings.png differ diff --git a/android/res/drawable-ldpi/ic_action_close.png b/android/res/drawable-ldpi/ic_action_close.png new file mode 100644 index 0000000000..65bf37c1d7 Binary files /dev/null and b/android/res/drawable-ldpi/ic_action_close.png differ diff --git a/android/res/drawable-ldpi/ic_action_history.png b/android/res/drawable-ldpi/ic_action_history.png new file mode 100644 index 0000000000..85f2127777 Binary files /dev/null and b/android/res/drawable-ldpi/ic_action_history.png differ diff --git a/android/res/drawable-ldpi/ic_action_load.png b/android/res/drawable-ldpi/ic_action_load.png new file mode 100644 index 0000000000..92ae2f321e Binary files /dev/null and b/android/res/drawable-ldpi/ic_action_load.png differ diff --git a/android/res/drawable-ldpi/ic_action_open.png b/android/res/drawable-ldpi/ic_action_open.png new file mode 100644 index 0000000000..a291177360 Binary files /dev/null and b/android/res/drawable-ldpi/ic_action_open.png differ diff --git a/android/res/drawable-ldpi/ic_action_save.png b/android/res/drawable-ldpi/ic_action_save.png new file mode 100644 index 0000000000..929966cacb Binary files /dev/null and b/android/res/drawable-ldpi/ic_action_save.png differ diff --git a/android/res/drawable-ldpi/ic_action_settings.png b/android/res/drawable-ldpi/ic_action_settings.png new file mode 100644 index 0000000000..7a3dc396bc Binary files /dev/null and b/android/res/drawable-ldpi/ic_action_settings.png differ diff --git a/android/res/drawable-mdpi/ic_action_close.png b/android/res/drawable-mdpi/ic_action_close.png new file mode 100644 index 0000000000..af5a18a5fa Binary files /dev/null and b/android/res/drawable-mdpi/ic_action_close.png differ diff --git a/android/res/drawable-mdpi/ic_action_history.png b/android/res/drawable-mdpi/ic_action_history.png new file mode 100644 index 0000000000..e75db82cb5 Binary files /dev/null and b/android/res/drawable-mdpi/ic_action_history.png differ diff --git a/android/res/drawable-mdpi/ic_action_load.png b/android/res/drawable-mdpi/ic_action_load.png new file mode 100644 index 0000000000..659c27fc84 Binary files /dev/null and b/android/res/drawable-mdpi/ic_action_load.png differ diff --git a/android/res/drawable-mdpi/ic_action_open.png b/android/res/drawable-mdpi/ic_action_open.png new file mode 100644 index 0000000000..9d0c7c070b Binary files /dev/null and b/android/res/drawable-mdpi/ic_action_open.png differ diff --git a/android/res/drawable-mdpi/ic_action_save.png b/android/res/drawable-mdpi/ic_action_save.png new file mode 100644 index 0000000000..45c25de467 Binary files /dev/null and b/android/res/drawable-mdpi/ic_action_save.png differ diff --git a/android/res/drawable-mdpi/ic_action_settings.png b/android/res/drawable-mdpi/ic_action_settings.png new file mode 100644 index 0000000000..522c8a9cf5 Binary files /dev/null and b/android/res/drawable-mdpi/ic_action_settings.png differ diff --git a/android/res/menu/main_menu.xml b/android/res/menu/main_menu.xml new file mode 100644 index 0000000000..e6d0cc623f --- /dev/null +++ b/android/res/menu/main_menu.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/android/src/com/retroarch/MainActivity.java b/android/src/com/retroarch/MainActivity.java index aae2172216..2a1f77b482 100644 --- a/android/src/com/retroarch/MainActivity.java +++ b/android/src/com/retroarch/MainActivity.java @@ -2,6 +2,10 @@ package com.retroarch; import android.app.Activity; import android.content.Context; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.widget.Toast; import android.opengl.GLSurfaceView; import android.os.Bundle; @@ -18,6 +22,20 @@ public class MainActivity extends Activity setContentView(ctx_gl); } + public boolean onCreateOptionsMenu(Menu menu) + { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.main_menu, menu); + return true; + } + + public boolean onOptionsItemSelected(MenuItem item) + { + Toast.makeText(this, "MenuItem " + item.getTitle() + " selected.", Toast.LENGTH_SHORT).show(); + + return true; + } + @Override protected void onPause() {