From cadc1489a5fe36feded11b85525564c6489a1ae3 Mon Sep 17 00:00:00 2001
From: Matteo Hausner <matteo.hausner@gmail.com>
Date: Fri, 10 Jan 2014 22:38:23 +0100
Subject: [PATCH 1/2] Added version name string to about message

---
 .../src/com/reicast/emulator/MainActivity.java       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/shell/android/src/com/reicast/emulator/MainActivity.java b/shell/android/src/com/reicast/emulator/MainActivity.java
index 62ed30406..975b63e80 100644
--- a/shell/android/src/com/reicast/emulator/MainActivity.java
+++ b/shell/android/src/com/reicast/emulator/MainActivity.java
@@ -6,6 +6,8 @@ import java.util.ArrayList;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
@@ -457,9 +459,17 @@ public class MainActivity extends FragmentActivity implements
 			// set title
 			alertDialogBuilder.setTitle("About reicast");
 
+			String versionName = "unknown";
+			try {
+				PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
+				versionName = pInfo.versionName;
+			} catch (NameNotFoundException e) {
+				e.printStackTrace();
+			}
+
 			// set dialog message
 			alertDialogBuilder
-					.setMessage("reicast is a dreamcast emulator")
+					.setMessage("reicast is a dreamcast emulator\n\nVersion: " + versionName)
 					.setCancelable(false)
 					.setPositiveButton("Dismiss",
 							new DialogInterface.OnClickListener() {

From 2cabeb69f38ce68be0da374ef90cb45398acc37b Mon Sep 17 00:00:00 2001
From: Matteo Hausner <matteo.hausner@gmail.com>
Date: Fri, 10 Jan 2014 22:53:31 +0100
Subject: [PATCH 2/2] Moved about box strings to string resource file

---
 shell/android/res/values/strings.xml                     | 3 +++
 shell/android/src/com/reicast/emulator/MainActivity.java | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml
index 1132d1238..17d4d2396 100644
--- a/shell/android/res/values/strings.xml
+++ b/shell/android/res/values/strings.xml
@@ -30,6 +30,9 @@
     <string name="select_controller_title">Select Controller</string>
     <string name="select_controller_message">Press any button on the controller to assign to port</string>
     <string name="controller_already_in_use">This controller is already in use!</string>
+
+    <string name="about_title">About reicast</string>
+    <string name="about_text">reicast is a dreamcast emulator\n\nVersion:</string>
     
     <string-array name="images">
         <item>cdi</item>
diff --git a/shell/android/src/com/reicast/emulator/MainActivity.java b/shell/android/src/com/reicast/emulator/MainActivity.java
index 975b63e80..a16797973 100644
--- a/shell/android/src/com/reicast/emulator/MainActivity.java
+++ b/shell/android/src/com/reicast/emulator/MainActivity.java
@@ -457,9 +457,9 @@ public class MainActivity extends FragmentActivity implements
 					MainActivity.this);
 
 			// set title
-			alertDialogBuilder.setTitle("About reicast");
+			alertDialogBuilder.setTitle(getString(R.string.about_title));
 
-			String versionName = "unknown";
+			String versionName = "";
 			try {
 				PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
 				versionName = pInfo.versionName;
@@ -469,7 +469,7 @@ public class MainActivity extends FragmentActivity implements
 
 			// set dialog message
 			alertDialogBuilder
-					.setMessage("reicast is a dreamcast emulator\n\nVersion: " + versionName)
+					.setMessage(getString(R.string.about_text) + " " + versionName)
 					.setCancelable(false)
 					.setPositiveButton("Dismiss",
 							new DialogInterface.OnClickListener() {