Merge branch 'master' into android-core-control

Source/Android/AndroidManifest.xml

@@ -7,10 +7,10 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="14" />
+        android:targetSdkVersion="18" />
+
+    <uses-feature android:glEsVersion="0x00020000" />
 
-    <uses-feature android:glEsVersion="0x00020000" >
-    </uses-feature>
     <uses-feature android:name="android.hardware.screen.landscape" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -18,7 +18,7 @@
     <uses-permission android:name="android.permission.INTERNET" /> 
 
     <application
-        android:icon="@drawable/launcher"
+        android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
         <activity
             android:name="org.dolphinemu.dolphinemu.DolphinEmulator"
@@ -40,8 +40,8 @@
 
         <activity
             android:name="org.dolphinemu.dolphinemu.settings.PrefsActivity"
-            android:label="@string/settings" >
-        </activity>
+            android:label="@string/settings" />
+
     </application>
 
 </manifest>

Source/Android/assets/Dolphin.ini

@@ -10,7 +10,7 @@ CPUCore = 3
 CPUThread = False
 GFXBackend = Software Renderer
 HLE_BS2 = False
-Fastmem = True
+Fastmem = False
 DSPThread = False
 DSPHLE = True
 SkipIdle = True
@@ -56,7 +56,7 @@ ShowStatusbar = True
 ShowLogWindow = False
 ShowLogConfigWindow = False
 ShowConsole = False
-ThemeName = Boomy
+ThemeName40 = Clean
 [Hotkeys]
 Open = 79
 OpenModifier = 2

Source/Android/res/layout/about_layout.xml

@@ -2,22 +2,23 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="6dp">
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/AboutItemTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:layout_marginTop="5dip"
+        android:layout_marginLeft="15dip"
+        android:layout_marginTop="6dip"
         android:singleLine="true"
-        android:textStyle="bold" />
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
 
     <TextView
         android:id="@+id/AboutItemSubTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dip" />
+        android:layout_marginLeft="15dip"
+        android:textAppearance="?android:attr/textAppearanceSmall"/>
 
 </LinearLayout>

Source/Android/res/menu/emuwindow_overlay.xml

@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/saveStateRoot"
-        android:showAsAction="always"
+        android:showAsAction="ifRoom"
         android:title="@string/overlay_savestate">
         <menu>
             <item android:id="@+id/saveSlot1"
@@ -22,8 +22,8 @@
     </item>
 
     <item
-        android:id="@+id/loadtateRoot"
-        android:showAsAction="always"
+        android:id="@+id/loadStateRoot"
+        android:showAsAction="ifRoom"
         android:title="@string/overlay_loadstate">
         <menu>
             <item android:id="@+id/loadSlot1"

Source/Android/res/values-ja/strings.xml

@@ -9,13 +9,12 @@
     <string name="drawer_close">ナビゲーションウィンドウを閉じる</string>
     
     <!-- About Fragment -->
-    <string name="build_revision">ビルドのバージョン：</string>
-    <string name="supports_gles3">サポートのOpenGL ES 3：</string>
+    <string name="build_revision">ビルドのバージョン</string>
+    <string name="supports_gles3">サポートのOpenGL ES 3</string>
     
     <!-- Folder Browser -->
     <string name="current_dir">現在のディレクトリ： </string>
     <string name="parent_directory">親ディレクトリ</string>
-    <string name="folder">フォルダ</string>
     <string name="file_size">ファイルサイズ: </string>
     
     <!-- Game List Activity -->
@@ -24,7 +23,6 @@
     <string name="game_list">ゲームリスト</string>
     <string name="browse_folder">フォルダの参照</string>
     <string name="settings">設定</string>
-    <string name="gamepad_config">ゲームパッド設定</string>
     <string name="about">について</string>
 
     <!-- Game List Fragment -->
@@ -42,9 +40,9 @@
     <string name="overlay_slot5">スロット 5</string>
 
     <!-- Input Config Fragment -->
-    <string name="input_settings">入力設定</string>
+    <string name="input_settings">入力</string>
     <string name="input_binding">入力バインディング</string>
-    <string name="input_binding_descrip">このコントロールにバインドするための入力を移動または押してください。</string>
+    <string name="input_binding_descrip">%1$sにバインドするための入力を移動または押してください。</string>
     <string name="button_a">Aボタン</string>
     <string name="button_b">Bボタン</string>
     <string name="button_start">スタートボタン</string>
@@ -65,7 +63,6 @@
     <string name="c_stick_right">C-スティック: →</string>
     <string name="trigger_left">左のトリガー</string>
     <string name="trigger_right">右のトリガー</string>
-    <string name="press_button_to_config">%1$sを設定するにはボタンを押して</string>
     
     <!-- Prefs Fragment -->
     <string name="interpreter">Interpreter</string>
@@ -73,11 +70,13 @@
     <string name="jitil_recompiler">JITIL Recompiler</string>
     <string name="jit_arm_recompiler">JIT ARM Recompiler</string>
     <string name="cpu_core">CPUコア</string>
-    <string name="cpu_settings">CPU設定</string>
+    <string name="cpu_settings">CPU</string>
     <string name="emu_core_to_use">使用するエミュレーションコア</string>
     <string name="dual_core">デュアルコア</string>
     <string name="dual_core_descrip">処理のための2つのCPUコアを使用して。速度が向上します。</string>
-    <string name="video_settings">ビデオ設定</string>
+    <string name="fastmem">Fastmem</string>
+    <string name="fastmem_desc">メモリアクセスのために潜在的に危険な最適化を使用して。</string>
+    <string name="video_settings">ビデオ</string>
     <string name="software_renderer">Software Renderer</string>
     <string name="opengl_es3">OpenGL ES 3</string>
     <string name="video_backend">ビデオレンダラ</string>
@@ -89,6 +88,8 @@
     <string name="enhancements">画質向上の設定</string>
     <string name="internal_resolution">内部解像度の変更</string>
     <string name="internal_resolution_descrip">内部解像度の計算方式を設定します。高解像度に設定することで大きく 画質が向上します。 しかし、ゲームによっては非常に重くなったり描画バグの原因となります。 【ゲーム解像度の倍数】は【ウィンドウサイズに拡大】より少し重くなり ますが、描画バグは発生しにくくなります。 また一般的に内部解像度が低いほど、動作速度は向上します。</string>
+    <string name="FSAA">フルシーンアンチエイリアシング</string>
+    <string name="FSAA_descrip">3Dグラフィックスをラスタライズによって生じるエイリアシングの量が減少。 レンダリングされた画像はあまりギザギザになります。 抽選でエミュレーション速度を下げます。問題を引き起こす可能性があります。</string>
     <string name="anisotropic_filtering">異方性フィルタリング</string>
     <string name="anisotropic_filtering_descrip">異方性フィルタリングを適用します。 奥行きのあるテクスチャをより精細に描画することが出来ます。 特定のゲームでは描画バグの原因になることがあります。</string>
     <string name="scaled_efb_copy">Scaled EFB Copy</string>

Source/Android/res/values/arrays.xml

@@ -108,7 +108,19 @@
         <item>6</item>
         <item>7</item>
     </string-array>
-    
+
+    <!-- FSAA Preference -->
+    <string-array name="FSAAEntries" translatable="false">
+        <item>1x</item>
+        <item>2x</item>
+        <item>4x</item>
+    </string-array>
+    <string-array name="FSAAValues" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
     <!-- Anisotropic Filtering Preference -->
     <string-array name="anisotropicFilteringEntries" translatable="false">
         <item>1x</item>

Source/Android/res/values/strings.xml

@@ -9,13 +9,12 @@
     <string name="drawer_close">Close navigation drawer</string>
 
     <!-- About Fragment -->
-    <string name="build_revision">Build Revision:</string>
-    <string name="supports_gles3">Supports OpenGL ES 3:</string>
+    <string name="build_revision">Build Revision</string>
+    <string name="supports_gles3">Supports OpenGL ES 3</string>
 
     <!-- Folder Browser -->
     <string name="current_dir">Current Dir: </string>
     <string name="parent_directory">Parent Directory</string>
-    <string name="folder">Folder</string>
     <string name="file_size">File Size: </string>
 
     <!-- Game List Activity -->
@@ -24,7 +23,6 @@
     <string name="game_list">Game List</string>
     <string name="browse_folder">Browse Folder</string>
     <string name="settings">Settings</string>
-    <string name="gamepad_config">Gamepad Config</string>
     <string name="about">About</string>
 
     <!-- Game List Fragment -->
@@ -44,7 +42,7 @@
     <!-- Input Config Fragment -->
     <string name="input_settings">Input</string>
     <string name="input_binding">Input Binding</string>
-    <string name="input_binding_descrip">Press or move an input to bind it to this control.</string>
+    <string name="input_binding_descrip">Press or move an input to bind it to %1$s.</string>
     <string name="button_a">Button A</string>
     <string name="button_b">Button B</string>
     <string name="button_start">Button Start</string>
@@ -65,7 +63,6 @@
     <string name="c_stick_right">C Stick Right</string>
     <string name="trigger_left">Trigger L</string>
     <string name="trigger_right">Trigger R</string>
-    <string name="press_button_to_config">Press button to configure %1$s</string>
 
     <!-- Preference Related -->
     <string name="interpreter">Interpreter</string>
@@ -77,6 +74,8 @@
     <string name="emu_core_to_use">Emulation core to use</string>
     <string name="dual_core">Dual Core</string>
     <string name="dual_core_descrip">Split workload to two CPU cores instead of one. Increases speed.</string>
+    <string name="fastmem">Fastmem</string>
+    <string name="fastmem_desc">Uses potentially unsafe optimizations for memory access.</string>
     <string name="video_settings">Video</string>
     <string name="software_renderer">Software Renderer</string>
     <string name="opengl_es3">OpenGL ES 3</string>
@@ -89,6 +88,8 @@
     <string name="enhancements">Enhancements</string>
     <string name="internal_resolution">Internal Resolution</string>
     <string name="internal_resolution_descrip">Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.</string>
+    <string name="FSAA">Full-scene Anti-aliasing</string>
+    <string name="FSAA_descrip">Reduces the amount of aliasing caused by rasterizing 3D graphics. This makes the rendered picture look less blocky. Heavily decreases emulation speed and sometimes causes issues.</string>
     <string name="anisotropic_filtering">Anisotropic Filtering</string>
     <string name="anisotropic_filtering_descrip">Enhances visual quality of textures that are at oblique viewing angles. Might cause issues in a small number of games.</string>
     <string name="scaled_efb_copy">Scaled EFB Copy</string>

Source/Android/res/xml/cpu_prefs.xml

@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- CPU Settings -->             
+    <!-- CPU Settings -->
     <CheckBoxPreference
-           android:key="dualCorePref"
-           android:summary="@string/dual_core_descrip"
-           android:title="@string/dual_core" />
-    
+        android:defaultValue="false"
+        android:key="dualCorePref"
+        android:summary="@string/dual_core_descrip"
+        android:title="@string/dual_core" />
+
     <ListPreference
         android:key="cpuCorePref"
         android:summary="@string/emu_core_to_use"
         android:title="@string/cpu_core" />
-        
+
+    <CheckBoxPreference
+        android:defaultValue="false"
+        android:key="fastmemPref"
+        android:summary="@string/fastmem_desc"
+        android:title="@string/fastmem" />
+
 </PreferenceScreen>

Source/Android/res/xml/video_prefs.xml

@@ -14,6 +14,13 @@
             android:summary="@string/internal_resolution_descrip"
             android:title="@string/internal_resolution"/>
 
+        <ListPreference
+                android:entries="@array/FSAAEntries"
+                android:entryValues="@array/FSAAValues"
+                android:key="FSAA"
+                android:summary="@string/FSAA_descrip"
+                android:title="@string/FSAA"/>
+
         <ListPreference 
             android:entries="@array/anisotropicFilteringEntries"
             android:entryValues="@array/anisotropicFilteringValues"
@@ -129,9 +136,10 @@
        android:key="showFPS"
        android:summary="@string/show_fps_descrip"
        android:title="@string/show_fps"/>
-    
+    <!--
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="drawOnscreenControls"
         android:title="@string/draw_onscreen_controls"/>
+        -->
 </PreferenceScreen>

Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java

@@ -7,7 +7,7 @@
 package org.dolphinemu.dolphinemu;
 
 import android.app.Activity;
-import android.app.Fragment;
+import android.app.ListFragment;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -25,7 +25,7 @@ import org.dolphinemu.dolphinemu.settings.VideoSettingsFragment;
 /**
  * Represents the about screen.
  */
-public final class AboutFragment extends Fragment
+public final class AboutFragment extends ListFragment
 {
 	private static Activity m_activity;
 
@@ -44,6 +44,7 @@ public final class AboutFragment extends Fragment
 
 		AboutFragmentAdapter adapter = new AboutFragmentAdapter(m_activity, R.layout.about_layout, Input);
 		mMainList.setAdapter(adapter);
+		mMainList.setEnabled(false);  // Makes the list view non-clickable.
 
 		return mMainList;
 	}
@@ -108,7 +109,7 @@ public final class AboutFragment extends Fragment
 			View v = convertView;
 			if (v == null)
 			{
-				LayoutInflater vi = (LayoutInflater)ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+				LayoutInflater vi = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 				v = vi.inflate(id, parent, false);
 			}
 			

Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java

@@ -58,16 +58,15 @@ public final class DolphinEmulator extends Activity
 		super.onCreate(savedInstanceState);
 		if (savedInstanceState == null)
 		{
-			Intent ListIntent = new Intent(this, GameListActivity.class);
-			startActivityForResult(ListIntent, 1);
+			Intent GameListIntent = new Intent(this, GameListActivity.class);
+			startActivity(GameListIntent);
 
 			String BaseDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu";
 			String ConfigDir = BaseDir + File.separator + "Config";
 			String GCDir = BaseDir + File.separator + "GC";
-			String WiiDir = BaseDir + File.separator + "Wii";
 
 			// Copy assets if needed
-			File file = new File(WiiDir + File.separator + "setting-usa.txt");
+			File file = new File(GCDir + File.separator + "font_sjis.bin");
 			if(!file.exists())
 			{
 				NativeLibrary.CreateUserFolders();
@@ -81,10 +80,6 @@ public final class DolphinEmulator extends Activity
 				CopyAsset("dsp_rom.bin",     GCDir + File.separator + "dsp_rom.bin");
 				CopyAsset("font_ansi.bin",   GCDir + File.separator + "font_ansi.bin");
 				CopyAsset("font_sjis.bin",   GCDir + File.separator + "font_sjis.bin");
-				CopyAsset("setting-eur.txt", WiiDir + File.separator + "setting-eur.txt");
-				CopyAsset("setting-jpn.txt", WiiDir + File.separator + "setting-jpn.txt");
-				CopyAsset("setting-kor.txt", WiiDir + File.separator + "setting-kor.txt");
-				CopyAsset("setting-usa.txt", WiiDir + File.separator + "setting-usa.txt");
 			}
 
 			// Load the configuration keys set in the Dolphin ini and gfx ini files

Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java

@@ -1,28 +1,23 @@
 package org.dolphinemu.dolphinemu;
 
-import java.util.List;
-
-import org.dolphinemu.dolphinemu.settings.InputConfigFragment;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.util.DisplayMetrics;
-import android.view.InputDevice;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.Window;
-import android.view.WindowManager;
+import android.view.*;
 import android.view.WindowManager.LayoutParams;
+import org.dolphinemu.dolphinemu.settings.InputConfigFragment;
+import org.dolphinemu.dolphinemu.settings.VideoSettingsFragment;
+
+import java.util.List;
 
 /**
  * This is the activity where all of the emulation handling happens.
@@ -63,7 +58,18 @@ public final class EmulationActivity extends Activity
 		// and set on the native side of the code so the emulator can actually
 		// load the game.
 		Intent gameToEmulate = getIntent();
-		NativeLibrary.SetDimensions((int)screenWidth, (int)screenHeight);
+
+		// Due to a bug in Adreno, it renders the screen rotated 90 degrees when using OpenGL
+		// Flip the width and height when on Adreno to work around this.
+		// Mali isn't affected by this bug.
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+		if (prefs.getString("gpuPref", "Software Rendering").equals("OGL")
+				&& VideoSettingsFragment.SupportsGLES3()
+				&& VideoSettingsFragment.m_GLVendor.equals("Qualcomm"))
+			NativeLibrary.SetDimensions((int)screenHeight, (int)screenWidth);
+		else
+			NativeLibrary.SetDimensions((int)screenWidth, (int)screenHeight);
+
 		NativeLibrary.SetFilename(gameToEmulate.getStringExtra("SelectedGame"));
 		Running = true;
 
@@ -224,7 +230,7 @@ public final class EmulationActivity extends Activity
 			}
 
 			default:
-				return super.onOptionsItemSelected( item );
+				return super.onMenuItemSelected(itemId, item);
 		}
 	}