[Android] Remove fps from touchscreen profile

Android/assets/project64_data/profiles/touchscreen.cfg

@@ -1,12 +1,5 @@
-[FPS-Only]
-comment=
-fps-x=50
-fps-y=100
-
 [Analog]
 comment=All controls except D-pad and L-button
-fps-x=50
-fps-y=100
 analog-x=0
 analog-y=100
 analog-min=1
@@ -25,8 +18,6 @@ buttonS-y=0
 
 [Digital]
 comment=All controls except analog stick and Z-trigger
-fps-x=50
-fps-y=100
 dpad-x=0
 dpad-y=100
 groupAB-x=100
@@ -42,8 +33,6 @@ buttonS-y=0
 
 [Everything]
 comment=All controls
-fps-x=50
-fps-y=100
 analog-x=0
 analog-y=100
 analog-min=1
@@ -63,3 +52,6 @@ buttonZ-x=0
 buttonZ-y=58
 buttonS-x=50
 buttonS-y=0
+
+[Nothing]
+comment=Do not show touchscreen controls

Android/src/emu/project64/SplashActivity.java

@@ -41,10 +41,10 @@ public class SplashActivity extends Activity implements ExtractAssetsListener
      * Asset version number, used to determine stale assets. Increment this number every time the
      * assets are updated on disk.
      */
-    private static final int ASSET_VERSION = 1;
+    private static final int ASSET_VERSION = 2;
     
     /** The total number of assets to be extracted (for computing progress %). */
-    private static final int TOTAL_ASSETS = 111;
+    private static final int TOTAL_ASSETS = 89;
     
     /** The minimum duration that the splash screen is shown, in milliseconds. */
     private static final int SPLASH_DELAY = 2000;
@@ -110,6 +110,12 @@ public class SplashActivity extends Activity implements ExtractAssetsListener
         moveTaskToBack(true);
     }
     
+    static public void Reset ()
+    {
+    	mInit = false;
+    	mAppInit = false;
+    }
+    
     private void InitProject64()
     {
         String LibsDir = this.getFilesDir().getParentFile().getAbsolutePath() + "/lib/";

Android/src/emu/project64/dialog/ProgressDialog.java

@@ -64,7 +64,7 @@ public class ProgressDialog implements OnClickListener
         
         // Create canceling dialog
         subtitle = mActivity.getString( R.string.toast_canceling );
-        message = mActivity.getString( R.string.toast_canceling 	 );
+        message = mActivity.getString( R.string.toast_canceling );
         layout = inflater.inflate( R.layout.progress_dialog, null );
         builder = getBuilder( activity, title, subtitle, message, false, layout );
         mAbortDialog = builder.create();