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 42b3231c8c6a..b0f9358852f9 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 boolean handleOptionSelection(int itemId) 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 bf9087bef169..c4f753edbd08 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 @@ private ListRow buildSettingsRow() { 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 @@ private ListRow buildSettingsRow() 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 206d6432ddc9..2ba41846b90a 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 void onGcPadSettingChanged(String key, int value) 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 59d4cbee779b..7aea8c88d004 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 void onGcPadSettingChanged(String key, int value) 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 4307ec891b84..8276077505c3 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 4028af87a265..182593c2c919 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 void onClick(DialogInterface dialog, int which) mView.onGcPadSettingChanged(scSetting.getKey(), value); } + if (scSetting.getKey().equals(SettingsFile.KEY_WIIMOTE_TYPE)) + { + mView.onWiimoteSettingChanged(scSetting.getSetting().getSection(), value); + } + // Get the backing Setting, which may be null (if for example it was missing from the file) IntSetting setting = scSetting.setSelectedValue(value); if (setting != null) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java index 6ccd5f1a2276..aacdfee03a6b 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java @@ -157,6 +157,12 @@ public void onGcPadSettingChanged(String key, int value) mActivity.onGcPadSettingChanged(key, value); } + @Override + public void onWiimoteSettingChanged(String section, int value) + { + mActivity.onWiimoteSettingChanged(section, value); + } + public static final String FRAGMENT_TAG = BuildConfig.APPLICATION_ID + ".fragment.settings"; public static final String ARGUMENT_MENU_TAG = FRAGMENT_TAG + ".menu_tag"; 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 72eaad91870b..01fad9d322d1 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 @@ -106,6 +106,10 @@ private void loadSettingsList() addGcPadSettings(sl); break; + case SettingsFile.FILE_NAME_WIIMOTE: + addWiimoteSettings(sl); + break; + case SettingsFile.SECTION_GFX_ENHANCEMENTS: addEnhanceSettings(sl); break; @@ -133,6 +137,7 @@ private void addCoreSettings(ArrayList sl) Setting dualCore = null; Setting overclockEnable = null; Setting overclock = null; + Setting continuousScan = null; if (mSettings != null) { @@ -140,6 +145,7 @@ private void addCoreSettings(ArrayList sl) dualCore = mSettings.get(SettingsFile.SECTION_CORE).getSetting(SettingsFile.KEY_DUAL_CORE); 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); } else { @@ -154,7 +160,7 @@ private void addCoreSettings(ArrayList sl) sl.add(new CheckBoxSetting(SettingsFile.KEY_DUAL_CORE, SettingsFile.SECTION_CORE, R.string.dual_core, R.string.dual_core_descrip, true, dualCore)); 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)); } private void addGcPadSettings(ArrayList sl) @@ -170,6 +176,19 @@ private void addGcPadSettings(ArrayList sl) } } + 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 8cdf4361e779..e3a62bbbbb99 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 12221cb0feeb..22404d32d6ec 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 034da74ee0d9..112123fce3e2 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 e3e309ca73d2..fa2dcb7a00bc 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 01fad9d322d1..9c5cc0f40011 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 @@ private void addCoreSettings(ArrayList sl) Setting overclockEnable = null; Setting overclock = null; Setting continuousScan = null; + Setting wiimoteSpeaker = null; if (mSettings != null) { @@ -146,6 +147,7 @@ private void addCoreSettings(ArrayList sl) 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 @@ private void addCoreSettings(ArrayList sl) 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 22404d32d6ec..4d8e0875961a 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 fa2dcb7a00bc..60acc28c7079 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 b0f9358852f9..ecffb14ac06a 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 boolean handleOptionSelection(int itemId) 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 8276077505c3..62bb51a9a26d 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 zcmV;{0V)28P);(8^b^v(rM+MnQc6@d*^M5lg{NK?qhBwhAW1 z7{x-g6#wA*8<>M7tjXZ!87;(U*H8?fj!Pi z>fT=`c@!Lhcj0}J=ph)Xr%(zU2!HDv?1OHe#v#q|y_&#@90 z?8{X)=!tDJCEG&hpiPRkD}Loe6&n6!kh3NfQ^eyog;b;Im`$M^*Nq!X@HA<) z%kIGrQ*MN|Z@BNFNGKADgd(ATFQhZV7Qzss!F|ockWV=SfBtXK4`RD-IU_}m-2eap M07*qoM6N<$f<2GILjV8( 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 zcmV-40n7f0P)~%K~T_>xE(<(EG?`Q#EV!c1VwKkq_A>5fOrDYLL~7Iyg-`F zOiTuw415q~`;+$|ie*^}g9<&^zzyE;fjewzO=aETwUC4fJT3ls!59*v0cAMTVH4KS zgaX7!5nA+RCha{!NhDxE2M$o-l+ad%6P@XcmZ(EzvY+!XgDdsGc7ZA6Xio~-etO{O za{BO~^7(GEV?-Ctp$>7_QUaP$;5rJ0}Mr3LEgIns4l!O$r{&b$|glQN^`0=+8xfI@nX4Yx_{+RDdCPHt3u^ z_X~7)8lVL72>aX!gRlq}2G?PI42uqs;B>|&=@PVBxczOg0w0`fCq)J5=5(+H)dDI> zE$ndm=oEDa=B(ag6Gq_WM?ce|=Ku?F1I?V@*|Xk3^WYFN@JZ5e0Q1mpP&QlOHrv5l zsX}Es-xa_(T$`viS1<IpKyUkK1gtFGCW zrfTJSfQ*eb;NA-X>^2#|i2$echd%^ih(XFP0odS+bdD?Lgz#K|sKK#uKLiN$pA8d3?Ku@05X6KAOpw%|2#n2 q#^CR~5I~_FHY-U@h literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_wiimote.png new file mode 100644 index 0000000000000000000000000000000000000000..6dfcad379783586d116359fda3b04e20fd138c1e GIT binary patch literal 830 zcmV-E1Ht@>P)º1$)5U7T$9n*az-wOl1<=V_Q&; zcaX673I=(EnBEMQ@W>jE(2rNVc~}udA2x_EVya+)g*=N!$0hJ9q)#6}x2+L$vPnmt zf^}`k&^Lh>P5M=^y#_UsRBd%pY!O=AubGl#Vi&7R`UVbaJU0Vu1*gG1@RFx(y%r02 zG|+3Oz!pvMN2g4=Lc8-I>cIAhzq=k><;7b!0wp>DyHH&SmBzW&ESj0+UqlyCC&&Mi14B41o0*~4Dx&$ zP_Mg0g&06d25$sjUj%+Bz?& z8e@r3NrRvuMnPj~5EOTaAQ2>jLXSO)d{vZX`uI|?=DQ%e@m$^H*)`yeuYx8*hBVq3_EAuc^PI5f*ZR86D^3D? zL*$J5nkY^kNoC&3JDEIBt4XQFq*xU}B1i;@AQ2>jM34v)K_W;5i69Xqf<%xA5iBV7~4T3sY(wO0qQ&K7UBDwr4f(Y`M-=wR(26tqr-~a#s07*qo IM6N<$g7_tMrvLx| 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 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 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 60acc28c7079..40b6b5aa222d 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