Reference strings over hardcoded text, More documentation

README.md

@@ -19,9 +19,15 @@ Let's try to keep everything under a single project :)
 To build for android
 --------------------
 Tools required:
-* Latest Android SDK and NDK
-* Android 4.4 (API 19) or newer (http://developer.android.com/sdk/installing/adding-packages.html)
+* Latest Android SDK
+ - http://developer.android.com/sdk/index.html
+* NDK r8b or newer
+ - https://developer.android.com/tools/sdk/ndk/index.html
+ - If using r9c+, it is recommended you uncomment the "NDK_TOOLCHAIN_VERSION := 4.8" in shell/android/jni/Application.mk and shell/android/xperia/jni/Application.mk
+* Android 4.4 (API 19) 
+ - http://developer.android.com/sdk/installing/adding-packages.html
 * Ant
+ - http://ant.apache.org/
 
 From project root directory:
 ```

shell/android/jni/Application.mk

@@ -1,5 +1,5 @@
 APP_STL		:= stlport_static
 #APP_ABI 	:= armeabi-v7a x86
 APP_ABI		:= armeabi-v7a
-APP_PLATFORM	:= android-18
-NDK_TOOLCHAIN_VERSION := 4.8
+APP_PLATFORM	:= android-19
+#NDK_TOOLCHAIN_VERSION := 4.8

shell/android/res/values/strings.xml

@@ -6,6 +6,8 @@
     <string name="browser_path">Default System Path</string>
     <string name="games_path">Storage Path (location of .gdi, .chd or .cdi images)</string>
     <string name="game_path">Default Game Storage</string>
+    <string name="config_home">Please configure a home directory</string>
+    <string name="config_game">Please configure a games directory</string>
     
     <string name="boot_bios">Boot Dreamcast Bios</string>
     <string name="missing_bios">BIOS Missing. The Dreamcast BIOS is required for this emulator to work. Place the BIOS file in %1$s/data/dc_boot.bin</string>

shell/android/src/com/reicast/emulator/FileBrowser.java

@@ -148,7 +148,7 @@ public class FileBrowser extends Fragment {
 
 		File home = new File(home_directory);
 		if (!home.exists() || !home.isDirectory()) {
-			Toast.makeText(getActivity(), "Please configure a home directory",
+			Toast.makeText(getActivity(), R.string.config_home,
 					Toast.LENGTH_LONG).show();
 		}
 
@@ -217,7 +217,7 @@ public class FileBrowser extends Fragment {
 					createListItem(list, games.get(i));
 				}
 			} else {
-				Toast.makeText(parentActivity, "Please configure a games directory",
+				Toast.makeText(parentActivity, R.string.config_game,
 							Toast.LENGTH_LONG).show();
 			}
 			list.invalidate();

shell/android/src/com/reicast/emulator/GL2JNIActivity.java

@@ -23,7 +23,6 @@ import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
-import android.widget.Toast;
 
 import com.reicast.emulator.config.Config;
 import com.reicast.emulator.emu.GL2JNIView;

shell/android/src/com/reicast/emulator/GL2JNINative.java

@@ -23,7 +23,6 @@ import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
-import android.widget.Toast;
 
 import com.reicast.emulator.config.Config;
 import com.reicast.emulator.emu.GL2JNIView;

shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java

@@ -18,7 +18,6 @@ import android.widget.ImageButton;
 import android.widget.ImageView.ScaleType;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
-import android.widget.Toast;
 
 import com.reicast.emulator.MainActivity;
 import com.reicast.emulator.R;
@@ -70,9 +69,6 @@ public class EditVJoyActivity extends Activity {
 		vjoy_d_cached = VJoy.readCustomVjoyValues(getApplicationContext());
 
         JNIdc.show_osd();
-
-		Toast.makeText(getApplicationContext(),
-				"Press the back button for a menu", Toast.LENGTH_SHORT).show();
 	}
 
 	@Override

shell/android/src/com/reicast/emulator/config/InputFragment.java

@@ -416,8 +416,7 @@ public class InputFragment extends Fragment {
 				|| descriptor.equals(deviceDescriptorPlayer2)
 				|| descriptor.equals(deviceDescriptorPlayer3)
 				|| descriptor.equals(deviceDescriptorPlayer4)) {
-			Toast.makeText(parentActivity,
-					getString(R.string.controller_already_in_use),
+			Toast.makeText(parentActivity, R.string.controller_already_in_use,
 					Toast.LENGTH_SHORT).show();
 			return true;
 		}

shell/android/src/com/reicast/emulator/config/OptionsFragment.java

@@ -89,8 +89,7 @@ public class OptionsFragment extends Fragment {
 					home_directory = editBrowse.getText().toString();
 					if (home_directory.endsWith("/data")) {
 						home_directory.replace("/data", "");
-						Toast.makeText(parentActivity,
-								parentActivity.getText(R.string.data_folder),
+						Toast.makeText(parentActivity, R.string.data_folder,
 								Toast.LENGTH_SHORT).show();
 					}
 					mPrefs.edit().putString("home_directory", home_directory)

shell/android/xperia/jni/Application.mk

@@ -1,4 +1,4 @@
 #APP_ABI 	:= armeabi-v7a x86
 APP_ABI		:= armeabi-v7a
 APP_PLATFORM	:= android-9
-NDK_TOOLCHAIN_VERSION := 4.8
+#NDK_TOOLCHAIN_VERSION := 4.8