diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-06-22 22:54:28 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-06-22 22:54:36 -0500 |
| commit | 6bb7cc5fea05c05388b0a7a1e81ab98d6127ef1f (patch) | |
| tree | 8f136fa4e22e944c6a289f6b7a611c6faa6f928c /Source/Android/src | |
| parent | fea1e3b698e75e29df7ccd2dbdd5717bf225147e (diff) | |
[Android] Add an about screen that shows build revision.
Diffstat (limited to 'Source/Android/src')
4 files changed, 39 insertions, 1 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java new file mode 100644 index 0000000000..613523c8dd --- /dev/null +++ b/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java @@ -0,0 +1,31 @@ +package org.dolphinemu.dolphinemu; + +import android.app.ListActivity; +import android.os.Bundle; + +import java.util.ArrayList; +import java.util.List; + +/** + * Copyright 2013 Dolphin Emulator Project + * Licensed under GPLv2 + * Refer to the license.txt file included. + */ +public class AboutActivity extends ListActivity { + private FolderBrowserAdapter adapter; + private int configPosition = 0; + boolean Configuring = false; + boolean firstEvent = true; + + @Override + public void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + List<GameListItem> Input = new ArrayList<GameListItem>(); + int a = 0; + + Input.add(a++, new GameListItem(getApplicationContext(), "Build Revision", NativeLibrary.GetVersionString(), "")); + adapter = new FolderBrowserAdapter(this, R.layout.folderbrowser, Input); + setListAdapter(adapter); + } +} diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java index 9e9de31dab..825ba5bdd2 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java @@ -129,6 +129,7 @@ public class GameListActivity extends Activity { dir.add(new SideMenuItem("Browse Folder", 0)); dir.add(new SideMenuItem("Settings", 1)); dir.add(new SideMenuItem("Gamepad Config", 2)); + dir.add(new SideMenuItem("About", 3)); mDrawerAdapter = new SideMenuAdapter(this, R.layout.sidemenu, dir); mDrawerList.setAdapter(mDrawerAdapter); @@ -184,6 +185,11 @@ public class GameListActivity extends Activity { Intent ConfigIntent = new Intent(me, InputConfigActivity.class); startActivityForResult(ConfigIntent, 3); break; + case 3: + Toast.makeText(me, "Loading up About", Toast.LENGTH_SHORT).show(); + Intent AboutIntent = new Intent(me, AboutActivity.class); + startActivityForResult(AboutIntent, 3); + break; default: break; } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java index 3018300b12..6e5bfea66f 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java @@ -20,7 +20,7 @@ public class GameListItem implements Comparable<GameListItem>{ data = d; path = p; File file = new File(path); - if (!file.isDirectory()) + if (!file.isDirectory() && !path.equals("")) { int[] Banner = NativeLibrary.GetBanner(path); if (Banner[0] == 0) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java index 52918a040a..499dc7867b 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -16,6 +16,7 @@ public class NativeLibrary { public static native void SetConfig(String configFile, String Key, String Value, String Default); public static native int[] GetBanner(String filename); public static native String GetTitle(String filename); + public static native String GetVersionString(); public static native void Run(String File, Surface surf, int width, int height); public static native void UnPauseEmulation(); |
