From 85cf07e87e4d472bb83a736d5c4420918cc24469 Mon Sep 17 00:00:00 2001 From: sigmabeta Date: Sat, 6 Feb 2016 18:00:36 -0500 Subject: [PATCH 1/3] Add Wiimote Input menu --- .../dolphinemu/ui/main/MainPresenter.java | 3 +++ .../dolphinemu/ui/main/TvMainActivity.java | 12 +++++++---- .../ui/settings/SettingsActivity.java | 6 ++++++ .../settings/SettingsActivityPresenter.java | 14 +++++++++++++ .../ui/settings/SettingsActivityView.java | 10 +++++++++ .../ui/settings/SettingsAdapter.java | 5 +++++ .../ui/settings/SettingsFragment.java | 6 ++++++ .../settings/SettingsFragmentPresenter.java | 21 ++++++++++++++++++- .../ui/settings/SettingsFragmentView.java | 9 ++++++++ .../dolphinemu/utils/SettingsFile.java | 6 ++++++ .../app/src/main/res/menu/menu_game_grid.xml | 5 +++++ .../app/src/main/res/values/arrays.xml | 11 ++++++++++ .../app/src/main/res/values/strings.xml | 8 +++++++ 13 files changed, 111 insertions(+), 5 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java index 42b3231c8c..b0f9358852 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java @@ -54,6 +54,9 @@ public final class MainPresenter mView.launchSettingsActivity(SettingsFile.FILE_NAME_GCPAD); return true; + case R.id.menu_settings_wiimote: + mView.launchSettingsActivity(SettingsFile.FILE_NAME_WIIMOTE); + case R.id.menu_refresh: mView.refresh(); return true; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java index bf9087bef1..c4f753edbd 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java @@ -225,10 +225,6 @@ public final class TvMainActivity extends Activity implements MainView { ArrayObjectAdapter rowItems = new ArrayObjectAdapter(new SettingsRowPresenter()); - rowItems.add(new TvSettingsItem(R.id.menu_refresh, - R.drawable.ic_refresh_tv, - R.string.grid_menu_refresh)); - rowItems.add(new TvSettingsItem(R.id.menu_settings_core, R.drawable.ic_settings_core_tv, R.string.grid_menu_core_settings)); @@ -241,10 +237,18 @@ public final class TvMainActivity extends Activity implements MainView R.drawable.ic_settings_gcpad, R.string.grid_menu_gcpad_settings)); + rowItems.add(new TvSettingsItem(R.id.menu_settings_wiimote, + R.drawable.ic_settings_wiimote, + R.string.grid_menu_wiimote_settings)); + rowItems.add(new TvSettingsItem(R.id.button_add_directory, R.drawable.ic_add_tv, R.string.add_directory_title)); + rowItems.add(new TvSettingsItem(R.id.menu_refresh, + R.drawable.ic_refresh_tv, + R.string.grid_menu_refresh)); + // Create a header for this row. HeaderItem header = new HeaderItem(R.string.settings, getString(R.string.settings)); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java index 206d6432dd..2ba41846b9 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java @@ -156,6 +156,12 @@ public final class SettingsActivity extends AppCompatActivity implements Setting mPresenter.onGcPadSettingChanged(key, value); } + @Override + public void onWiimoteSettingChanged(String section, int value) + { + mPresenter.onWiimoteSettingChanged(section, value); + } + private SettingsFragment getFragment() { return (SettingsFragment) getFragmentManager().findFragmentByTag(SettingsFragment.FRAGMENT_TAG); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java index 59d4cbee77..7aea8c88d0 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java @@ -174,4 +174,18 @@ public final class SettingsActivityPresenter break; } } + + public void onWiimoteSettingChanged(String section, int value) + { + switch (value) + { + case 1: + mView.showToastMessage("Configuration coming soon. Settings from old versions will still work."); + break; + + case 2: + mView.showToastMessage("Please make sure Continuous Scanning is enabled in Core Settings."); + break; + } + } } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java index 4307ec891b..8276077505 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java @@ -78,4 +78,14 @@ public interface SettingsActivityView * @param value New setting for the GCPad. */ void onGcPadSettingChanged(String key, int value); + + /** + * Called by a containing Fragment tell the containing Activity that a Wiimote's setting + * was modified. + * + * @param section Identifier for Wiimote that was modified; Wiimotes are identified by their section, + * not their key. + * @param value New setting for the Wiimote. + */ + void onWiimoteSettingChanged(String section, int value); } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsAdapter.java index 4028af87a2..182593c2c9 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsAdapter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsAdapter.java @@ -194,6 +194,11 @@ public final class SettingsAdapter extends RecyclerView.Adapter sl) @@ -170,6 +176,19 @@ public final class SettingsFragmentPresenter } } + private void addWiimoteSettings(ArrayList sl) + { + if (mSettings != null) + { + for (int i = 1; i <= 4; i++) + { + // TODO This wiimote_0 + i business is quite the hack. It should work, but only if the definitions are kept together and in order. + Setting wiimoteSetting = mSettings.get(SettingsFile.SECTION_WIIMOTE + i).getSetting(SettingsFile.KEY_WIIMOTE_TYPE); + sl.add(new SingleChoiceSetting(SettingsFile.KEY_WIIMOTE_TYPE, SettingsFile.SECTION_WIIMOTE + i, R.string.wiimote_0 + i - 1, 0, R.array.wiimoteTypeEntries, R.array.wiimoteTypeValues, 0, wiimoteSetting)); + } + } + } + private void addGraphicsSettings(ArrayList sl) { Setting showFps = null; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentView.java index 8cdf4361e7..e3a62bbbbb 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentView.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentView.java @@ -84,4 +84,13 @@ public interface SettingsFragmentView * @param value New setting for the GCPad. */ void onGcPadSettingChanged(String key, int value); + + /** + * Have the fragment tell the containing Activity that a Wiimote's setting was modified. + * + * @param section Identifier for Wiimote that was modified; Wiimotes are identified by their section, + * not their key. + * @param value New setting for the Wiimote. + */ + void onWiimoteSettingChanged(String section, int value); } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java index 12221cb0fe..22404d32d6 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java @@ -41,6 +41,8 @@ public final class SettingsFile public static final String SECTION_STEREOSCOPY = "Stereoscopy"; + public static final String SECTION_WIIMOTE = "Wiimote"; + public static final String KEY_CPU_CORE = "CPUCore"; public static final String KEY_DUAL_CORE = "CPUThread"; public static final String KEY_OVERCLOCK_ENABLE = "OverclockEnable"; @@ -78,6 +80,10 @@ public final class SettingsFile public static final String KEY_GCADAPTER_RUMBLE = "AdapterRumble"; public static final String KEY_GCADAPTER_BONGOS = "SimulateKonga"; + public static final String KEY_WIIMOTE_TYPE = "Source"; + + public static final String KEY_WIIMOTE_SCAN = "WiimoteContinuousScanning"; + // Internal only, not actually found in settings file. public static final String KEY_XFB_METHOD = "XFBMethod"; diff --git a/Source/Android/app/src/main/res/menu/menu_game_grid.xml b/Source/Android/app/src/main/res/menu/menu_game_grid.xml index 034da74ee0..112123fce3 100644 --- a/Source/Android/app/src/main/res/menu/menu_game_grid.xml +++ b/Source/Android/app/src/main/res/menu/menu_game_grid.xml @@ -16,6 +16,11 @@ android:title="@string/grid_menu_gcpad_settings" android:icon="@drawable/ic_settings_gcpad" app:showAsAction="ifRoom"/> + 12 + + Disabled + Emulated + "Real Wiimote (DolphinBar required)" + + + 0 + 1 + 2 + + diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index e3e309ca73..fa2dcb7a00 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -95,10 +95,14 @@ Modifier Range Analog Radius (High value = High sensitivity) Analog Threshold (Low value = High sensitivity) + + Wiimote 1 Wiimote 2 Wiimote 3 Wiimote 4 + + Enable Wiimote IR Motion Controls Swing Navigation @@ -245,6 +249,9 @@ Higher values can make variable-framerate games run at a higher framerate, requiring a powerful device. Lower values make games run at a lower framerate, increasing emulation speed, but reducing the emulated console\'s performance. Emulated CPU Clock Speed WARNING: Changing this from the default (100%) WILL break games and cause glitches. Please do not report bugs that occur with a non-default clock. + Wiimote Continuous Scanning + Leave this on if you are using a DolphinBar for real Wiimote support. + Video @@ -324,6 +331,7 @@ CPU Settings Video Settings GameCube Input + Wii Input Refresh Library From dd4082f21637d93edc1a8271c4a6d993fb90ca35 Mon Sep 17 00:00:00 2001 From: sigmabeta Date: Sat, 6 Feb 2016 18:36:08 -0500 Subject: [PATCH 2/3] Add Wiimote Speaker option --- .../dolphinemu/ui/settings/SettingsFragmentPresenter.java | 3 +++ .../org/dolphinemu/dolphinemu/utils/SettingsFile.java | 1 + Source/Android/app/src/main/res/values/strings.xml | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java index 01fad9d322..9c5cc0f400 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java @@ -138,6 +138,7 @@ public final class SettingsFragmentPresenter Setting overclockEnable = null; Setting overclock = null; Setting continuousScan = null; + Setting wiimoteSpeaker = null; if (mSettings != null) { @@ -146,6 +147,7 @@ public final class SettingsFragmentPresenter overclockEnable = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_OVERCLOCK_ENABLE); overclock = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_OVERCLOCK_PERCENT); continuousScan = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_WIIMOTE_SCAN); + wiimoteSpeaker = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_WIIMOTE_SPEAKER); } else { @@ -161,6 +163,7 @@ public final class SettingsFragmentPresenter sl.add(new CheckBoxSetting(SettingsFile.KEY_OVERCLOCK_ENABLE, SettingsFile.SECTION_CORE, R.string.overclock_enable, R.string.overclock_enable_description, false, overclockEnable)); sl.add(new SliderSetting(SettingsFile.KEY_OVERCLOCK_PERCENT, SettingsFile.SECTION_CORE, R.string.overclock_title, 0, 400, "%", 100, overclock)); sl.add(new CheckBoxSetting(SettingsFile.KEY_WIIMOTE_SCAN, SettingsFile.SECTION_CORE, R.string.wiimote_scanning, R.string.wiimote_scanning_description, true, continuousScan)); + sl.add(new CheckBoxSetting(SettingsFile.KEY_WIIMOTE_SPEAKER, SettingsFile.SECTION_CORE, R.string.wiimote_speaker, R.string.wiimote_speaker_description, true, wiimoteSpeaker)); } private void addGcPadSettings(ArrayList sl) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java index 22404d32d6..4d8e087596 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java @@ -83,6 +83,7 @@ public final class SettingsFile public static final String KEY_WIIMOTE_TYPE = "Source"; public static final String KEY_WIIMOTE_SCAN = "WiimoteContinuousScanning"; + public static final String KEY_WIIMOTE_SPEAKER = "WiimoteEnableSpeaker"; // Internal only, not actually found in settings file. public static final String KEY_XFB_METHOD = "XFBMethod"; diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index fa2dcb7a00..60acc28c70 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -251,6 +251,8 @@ WARNING: Changing this from the default (100%) WILL break games and cause glitches. Please do not report bugs that occur with a non-default clock. Wiimote Continuous Scanning Leave this on if you are using a DolphinBar for real Wiimote support. + Wiimote Speaker + Enable sound output through the speaker on a real Wiimote (DolphinBar required). @@ -361,7 +363,11 @@ Enable the vibration function for this GameCube controller. Bongo Controller Enable this if you are using bongos on this port. - + + + General + Controllers + org.dolphinemu.dolphinemu From c2d03e62e7844d0725748d71f9adf8b1a3bf2f78 Mon Sep 17 00:00:00 2001 From: sigmabeta Date: Sat, 6 Feb 2016 18:46:37 -0500 Subject: [PATCH 3/3] Add Wiimote graphic --- .../dolphinemu/ui/main/MainPresenter.java | 3 +++ .../ui/settings/SettingsActivityView.java | 2 +- .../res/drawable-hdpi/ic_settings_wiimote.png | Bin 0 -> 470 bytes .../res/drawable-mdpi/ic_settings_wiimote.png | Bin 0 -> 308 bytes .../res/drawable-xhdpi/ic_settings_wiimote.png | Bin 0 -> 552 bytes .../res/drawable-xxhdpi/ic_settings_wiimote.png | Bin 0 -> 830 bytes .../res/drawable-xxxhdpi/ic_settings_wiimote.png | Bin 0 -> 1135 bytes .../main/res/drawable/ic_settings_wiimote.png | Bin 0 -> 1135 bytes .../Android/app/src/main/res/values/arrays.xml | 2 +- .../Android/app/src/main/res/values/strings.xml | 6 ++++-- 10 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_settings_wiimote.png create mode 100644 Source/Android/app/src/main/res/drawable-mdpi/ic_settings_wiimote.png create mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_wiimote.png create mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_wiimote.png create mode 100644 Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_wiimote.png create mode 100644 Source/Android/app/src/main/res/drawable/ic_settings_wiimote.png diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java index b0f9358852..ecffb14ac0 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java @@ -56,8 +56,11 @@ public final class MainPresenter case R.id.menu_settings_wiimote: mView.launchSettingsActivity(SettingsFile.FILE_NAME_WIIMOTE); + return true; case R.id.menu_refresh: + GameDatabase databaseHelper = DolphinApplication.databaseHelper; + databaseHelper.scanLibrary(databaseHelper.getWritableDatabase()); mView.refresh(); return true; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java index 8276077505..62bb51a9a2 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java @@ -80,7 +80,7 @@ public interface SettingsActivityView void onGcPadSettingChanged(String key, int value); /** - * Called by a containing Fragment tell the containing Activity that a Wiimote's setting + * Called by a containing Fragment to tell the containing Activity that a Wiimote's setting * was modified. * * @param section Identifier for Wiimote that was modified; Wiimotes are identified by their section, diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_wiimote.png new file mode 100644 index 0000000000000000000000000000000000000000..acd29054c7f9990c6dfc0767782773347a093515 GIT binary patch literal 470 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@?&h>P045_&FcKUuVW=DZ` z{$!S^DDCD3rRm4#rBCWqZYePFY_id@f1Rr^9)*7<-hy+4>_Zaw|(AYX7^%eMR-?-zP#2z9k6Ev(mHVth#KkiepYwPz1c@V8{H|CfJ( ZKWTTqrLt?^T?PgQ22WQ%mvv4FO#nTQ!b1Q6 literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_settings_wiimote.png new file mode 100644 index 0000000000000000000000000000000000000000..0f6d19efb132479b04ea7e3a92028c4df9086b09 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJoetWt&hE&{od&QFLkb?-@ z1Cb_;vQ93g9Wjmp7bfqJb=1+(T_bX&J3@oSHD6)Lh9cXB3Z{!rDj)gxILtcZ6?1@;noQ)oHn}uDh^5rEn-ZyxSS|_?LrIF z5f8zrFR5y8ZJj(-5**n10v=Ae5Y{R@_ht9A70#)f=6^P5*8X~+tWonxhCkP>x~c~+ zihg}q@abpXreqiKvkUnOFEy~PZVi6$`{Ln>~)y>V8XB~ga` zL+qTg>#sc@DNUK6RNpWsVz=9&)}jSJgrBG$zsvoTy+uZ5iO5qGbw968-a_HB(+9nu zEd5yfs{De<`5QAU)6(0Xuk_E|ZT#8he%ieI#=luYLU}m^8udI5n9VuNyyvjE%^}q{ zPC}0YG#2GstFtR|Nq<;2EC0br45W0fk(F*zc}yOV09ySZuakh#~}@h6=pBy z*na0ODVJKn@`>a39ggM=9O7)(6Ki?8`6fIlIi~hfXiLJ;%=v1dKj-UMgVtd?7Eu zEc$`j?Ss)Pol>ptiyp9unZ3d++<@(8oQ|0s+}OLRlI3gO+9S5J(ywJzFS=^+ zoH4D0?K9Wu1rDmVaXzA74rx8#ntZ93;nu4yY)>QS1T(%)TiqMXI3rSGYr#DhpPfI= zUU3>7i08QAzIxrwY0I*nRyFkWnm)M4&G^Pl@<1oU@-OZ7EQuYCr}P_6B~)o$Z|w>?qRK zoRA#)AyB8}A#ru3pejeOITcwuwUzy4h+1*kyom| zh&y&wXidUij@(z-fB5G(T%1vT{LI`tJB#^hW-lu@`f1f)oOY=vNGo~f(*%7B?spC9 z4`gRB*v~BdFfD#J@41G%2`k_JyHzonZv%4-+u~JUD|q#qauar)ZhEmkmSuiO&BuA} z*OR8RtYtB;SaqZ8eFBS)_ofAU1qV0Ha9eaL!S52wTPFF?q9(B)b3Fx2q+_nX`NRK# zW6FWL4U9T0#s^K(#3ESCnwS$fY@Vf;KC(Hn&09eC(0P+3cUY?r+!4E1EO&$bUA9lE z(Cy^tfWGnx8-8%HRkqBy$20B2390@I{o#8mBLrRK%{mN{RwXpH+H|`eSN)*9#9!WF z`&z-0O`h)ano4s|Trh7G_x%;RVK1BMq>$Xwz#PG-JL_joN=_1A?fr|5FU!W9Ifr%m zLE8_LmgnvjLga{@rphPme~MGp&1GBzV8O>vN@{SGGNC7PbkR za?)n`-R>{*C#}oq$}D+ilH}dDHg}$i@287xE6w-|i=qNFEw-FLQYdn2yYkE}97SRi z6`EWod~VuQ<0m393GV?hN#7UZCLSn4BpfQr@8;sM6%rZ`)N9Iwkej zkDv|Db}Q`q7<2c@P16Ux>zmY^o?LnP^fJSH7E#k%8oxC>o>y5tU#u{9_9Z_-m8O4O zb7x=N)8Eu)a!cY{U_kHZIUAl||F!F^wjWcq^OK%mvo!od)dlU TRy<%}U|{fc^>bP0l+XkK_$76x literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_wiimote.png new file mode 100644 index 0000000000000000000000000000000000000000..489f5f5eb6e274963e45b6c34506f899d507da5b GIT binary patch literal 1135 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^SB%sgEjLn>~)og3*95-4$8 zcIy^jrA4g@T^F_}E@th@P}JHW9^cf(wW!7Iih6X%B!j4o&G)(#ly2SMQnRAHYSoD* zm&FP#D>}BZUo0q!vi!^cnb$MKxO{f?y6^uFzE71nf2X>x>iqZG=l2ZVHK!(PR3@n1 z;NWXq{lM-8(_IC|Ixf!2wchs@->(+PnPB+I$JT!`pBmG%Cbk0hBU7s{vgbA5P3Wr; zW98URi_&_dmXor;RZu9-(RjX-I_DA z9jrKOgC0DQ@bkH*a$fy@x6X@rp?OV{7<}rwj6U3Xee$~&@894RI;szQ&d%#PclUbpYsnbCOHbcbZH!6Z zyzIpEDOV?-{Ju*xF!6D^n&->=i|_R3tqfMXwIW|@iqsxyqm>~WPP%DjsFyI7U6~+q zgM%^qfV;d@?k>}PR%e*pnohHo*qlG@7Px}NXX=$JQ!d;+cQR2hAn(Jp6cZk%vRii~ zc5;7f^fHJQyLhF}Vd9=J&AX?n&CHu#9WLTLwWWN?@9(z{SV+$|bnMz5e)G*+mQ2As zpUDeDc3$~(H95z3a;E8u3CkANPcCqL#kAet`@Ln1Vdf{_mCRD?Z~o_<4BGyAH|OO1 zAk{VHN5j%Se*SXouU^=p7AB1bCJRmx2S$}QOpA*0Cr*Cru6=t-)%;ykm?oWJm|ydv z?%OPdgDi||PwmfG*zhK%>|gojh!?CsWJMepK}bM`@$IF{`e7%l?M;6jyPtKzk?|hq zi}08E`TZSpSXg&xJNW-g;!f7vs?f+}#9_@}782ZG&2%fbPx@qm?}7#s!D53lURDe7 zfHw(mg18Fw4xCJOV-;~=Y!rX+xX9tuy9^ zY?;GpSmi)%7$FG_^#`Ivwaz_j#?&J1<7D#m-uHf;^46Rc^05{b80r zn$cJdB?iis>g*P+9 o+WzEw*Hvn<1~4pa`0$Ba+4jEM?$%~@1_lNOPgg&ebxsLQ0G>|qHUIzs literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable/ic_settings_wiimote.png new file mode 100644 index 0000000000000000000000000000000000000000..489f5f5eb6e274963e45b6c34506f899d507da5b GIT binary patch literal 1135 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^SB%sgEjLn>~)og3*95-4$8 zcIy^jrA4g@T^F_}E@th@P}JHW9^cf(wW!7Iih6X%B!j4o&G)(#ly2SMQnRAHYSoD* zm&FP#D>}BZUo0q!vi!^cnb$MKxO{f?y6^uFzE71nf2X>x>iqZG=l2ZVHK!(PR3@n1 z;NWXq{lM-8(_IC|Ixf!2wchs@->(+PnPB+I$JT!`pBmG%Cbk0hBU7s{vgbA5P3Wr; zW98URi_&_dmXor;RZu9-(RjX-I_DA z9jrKOgC0DQ@bkH*a$fy@x6X@rp?OV{7<}rwj6U3Xee$~&@894RI;szQ&d%#PclUbpYsnbCOHbcbZH!6Z zyzIpEDOV?-{Ju*xF!6D^n&->=i|_R3tqfMXwIW|@iqsxyqm>~WPP%DjsFyI7U6~+q zgM%^qfV;d@?k>}PR%e*pnohHo*qlG@7Px}NXX=$JQ!d;+cQR2hAn(Jp6cZk%vRii~ zc5;7f^fHJQyLhF}Vd9=J&AX?n&CHu#9WLTLwWWN?@9(z{SV+$|bnMz5e)G*+mQ2As zpUDeDc3$~(H95z3a;E8u3CkANPcCqL#kAet`@Ln1Vdf{_mCRD?Z~o_<4BGyAH|OO1 zAk{VHN5j%Se*SXouU^=p7AB1bCJRmx2S$}QOpA*0Cr*Cru6=t-)%;ykm?oWJm|ydv z?%OPdgDi||PwmfG*zhK%>|gojh!?CsWJMepK}bM`@$IF{`e7%l?M;6jyPtKzk?|hq zi}08E`TZSpSXg&xJNW-g;!f7vs?f+}#9_@}782ZG&2%fbPx@qm?}7#s!D53lURDe7 zfHw(mg18Fw4xCJOV-;~=Y!rX+xX9tuy9^ zY?;GpSmi)%7$FG_^#`Ivwaz_j#?&J1<7D#m-uHf;^46Rc^05{b80r zn$cJdB?iis>g*P+9 o+WzEw*Hvn<1~4pa`0$Ba+4jEM?$%~@1_lNOPgg&ebxsLQ0G>|qHUIzs literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml index 25cbec179a..4335648861 100644 --- a/Source/Android/app/src/main/res/values/arrays.xml +++ b/Source/Android/app/src/main/res/values/arrays.xml @@ -162,7 +162,7 @@ Disabled Emulated - "Real Wiimote (DolphinBar required)" + Real Wiimote (DolphinBar required) 0 diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index 60acc28c70..40b6b5aa22 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -79,7 +79,8 @@ GameCube Controllers Wii Controllers (Wiimotes) - + GameCube Controller 1 GameCube Controller 2 GameCube Controller 3 @@ -96,7 +97,8 @@ Analog Radius (High value = High sensitivity) Analog Threshold (Low value = High sensitivity) - + Wiimote 1 Wiimote 2 Wiimote 3