Merge pull request #1115 from patrickbabb/master

Various Android fixes

projects/mtg/Android/src/org/libsdl/app/SDLActivity.java

@@ -307,16 +307,18 @@ public class SDLActivity extends Activity implements OnKeyListener {
         importDeck.setTitle("Choose Deck to Import:");
 
         File root = new File(System.getenv("EXTERNAL_STORAGE") + "/Download");
-        File[] files = root.listFiles();
+	File[] files = root.listFiles();
 
-        for (File f : files) {
+        if (files != null) {
-            if (!myresult.contains(f.toString()) &&
+			for (File f : files) {
-                    (f.toString().contains(".txt") ||
+				if (!myresult.contains(f.toString()) &&
-                    f.toString().contains(".dck") ||
+						(f.toString().contains(".txt") ||
-                    f.toString().contains(".dec"))) {
+						 f.toString().contains(".dck") ||
-                myresult.add(f.toString());
+						 f.toString().contains(".dec"))) {
-            }
+					myresult.add(f.toString());
-        }
+				}
+			}
+		}  
 
         //get first item?
         if (!myresult.isEmpty()) {
@@ -1115,24 +1117,49 @@ public class SDLActivity extends Activity implements OnKeyListener {
     }
 
     // Setup
-    @Override
+	private void enterImmersiveMode() {
-    protected void onCreate(Bundle savedInstanceState) {
+		final View decorView = getWindow().getDecorView();
-        //Log.d(TAG, "onCreate()");
+		decorView.setSystemUiVisibility(
-        super.onCreate(savedInstanceState);
+			View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+			| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+			| View.SYSTEM_UI_FLAG_FULLSCREEN
+			| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+			| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+			| View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+		);
+	}
+	
+	@Override
+		public void onWindowFocusChanged(boolean hasFocus) {
+			super.onWindowFocusChanged(hasFocus);
+			if (hasFocus) {
+				enterImmersiveMode();
+			}
+		}
 
-        StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll()
+	
-                                                                              .build();
+    @Override
-        StrictMode.setThreadPolicy(policy);
+	protected void onCreate(Bundle savedInstanceState) {
-        setContentView(R.layout.main);
+		super.onCreate(savedInstanceState);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
-        // So we can call stuff from static callbacks
+		StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
-        mSingleton = this;
+		StrictMode.setThreadPolicy(policy);
-        mContext = this.getApplicationContext();
+
-        RES_FILENAME = getResourceName();
+		setContentView(R.layout.main);
-        StorageOptions.determineStorageOptions(mContext);
+
-        checkStorageLocationPreference();
+		// Enable immersive mode
-        prepareOptionMenu(null);
+		enterImmersiveMode();
-    }
+
+		getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+		// So we can call stuff from static callbacks
+		mSingleton = this;
+		mContext = this.getApplicationContext();
+		RES_FILENAME = getResourceName();
+		StorageOptions.determineStorageOptions(mContext);
+		checkStorageLocationPreference();
+		prepareOptionMenu(null);
+}
 
     public void forceResDownload(final File oldRes) {
         AlertDialog.Builder resChooser = new AlertDialog.Builder(this);

projects/mtg/build.xml

@@ -88,8 +88,8 @@ Mod by: Vitty85
 #define WAGIC_CORE_VERSION_STRING "core_" VERSION_STRINGIFY(WAGIC_RESOURCE_VERSION)
 #define WAGIC_RESOURCE_NAME     "Wagic-core-" VERSION_STRINGIFY(WAGIC_RESOURCE_VERSION) ".zip"
 #define WAGIC_RELEASE_NAME      "wagic-v" WAGIC_VERSION_STRING
-#define WAGIC_RESOURCE_URL      "https://github.com/WagicProject/wagic/releases" WAGIC_RELEASE_NAME "/" WAGIC_RESOURCE_NAME
+#define WAGIC_RESOURCE_URL      "https://github.com/WagicProject/wagic/releases/download/" WAGIC_RELEASE_NAME "/" WAGIC_RESOURCE_NAME
-
+		
 #endif
 
         </echo>

projects/mtg/src/GameStateAwards.cpp

@@ -97,6 +97,12 @@ void GameStateAwards::Start()
 
     wgh = NEW WGuiHeader("");
     listview->Add(wgh);
+ 
+    #if !defined(PSP)
+	   WGuiItem* backLabel = NEW WGuiItem("Back to Main Menu");
+	   WGuiButton* backBtn = NEW WGuiButton(backLabel, EXIT_AWARDS_MENU, GameStateAwardsConst::kBackToMainMenuID, this);
+	   listview->Add(backBtn);
+	   #endif
 
     int locked = 0;