From 8c723d05841c784c7af90e6f29eb82c2120358f5 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 24 Dec 2020 14:55:10 +0100 Subject: [PATCH] Android: Only have one settings entrypoint per activity/dialog Basically, instead of having one button for config, one button for graphics settings and so on, we now have just one settings button which takes you to a screen where you pick between config/graphics/GameCube controllers/Wii Remotes. The main reason I want to do this is because people still have trouble finding Overlay Controls in the "new" in-game menu. Typically (depending on the screen size and the length of the game name), the scrollable part of the menu can fit 4 items, and merging Config and Graphics Settings into one item would move Overlay Controls from 5th place to 4th place (assuming the user doesn't have savestates enabled), which makes it findable even for users who don't realize the menu can be scrolled. The dialog that's shown when long pressing a game in the game list is also shortened. While not a pressing matter, I think it was getting a bit long. An additional reason to do this is because we probably will want to make it possible to edit the controller settings from the in-game menu at some point in the future. With the old approach, this would require us to dedicate a whopping 4 menu items just for settings (not including Overlay Controls), which I think is excessive. --- .../activities/EmulationActivity.java | 13 +++------- .../features/settings/ui/MenuTag.java | 1 + .../settings/ui/SettingsFragment.java | 9 ++++--- .../ui/SettingsFragmentPresenter.java | 20 +++++++++++++-- .../dolphinemu/fragments/MenuFragment.java | 4 +-- .../dolphinemu/ui/main/MainPresenter.java | 16 ++---------- .../dolphinemu/ui/main/TvMainActivity.java | 18 +++---------- .../main/res/drawable-hdpi/ic_settings.png | Bin 0 -> 460 bytes .../res/drawable-hdpi/ic_settings_core.png | Bin 228 -> 0 bytes .../res/drawable-hdpi/ic_settings_gcpad.png | Bin 231 -> 0 bytes .../drawable-hdpi/ic_settings_graphics.png | Bin 266 -> 0 bytes .../res/drawable-hdpi/ic_settings_wiimote.png | Bin 386 -> 0 bytes .../res/drawable-mdpi/ic_settings_gcpad.png | Bin 140 -> 0 bytes .../res/drawable-mdpi/ic_settings_wiimote.png | Bin 264 -> 0 bytes .../main/res/drawable-xhdpi/ic_settings.png | Bin 0 -> 554 bytes .../res/drawable-xhdpi/ic_settings_core.png | Bin 190 -> 0 bytes .../res/drawable-xhdpi/ic_settings_gcpad.png | Bin 212 -> 0 bytes .../drawable-xhdpi/ic_settings_graphics.png | Bin 300 -> 0 bytes .../drawable-xhdpi/ic_settings_wiimote.png | Bin 451 -> 0 bytes .../main/res/drawable-xxhdpi/ic_settings.png | Bin 0 -> 788 bytes .../res/drawable-xxhdpi/ic_settings_core.png | Bin 251 -> 0 bytes .../res/drawable-xxhdpi/ic_settings_gcpad.png | Bin 288 -> 0 bytes .../drawable-xxhdpi/ic_settings_graphics.png | Bin 450 -> 0 bytes .../drawable-xxhdpi/ic_settings_wiimote.png | Bin 653 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_settings.png | Bin 0 -> 1026 bytes .../res/drawable-xxxhdpi/ic_settings_core.png | Bin 318 -> 0 bytes .../drawable-xxxhdpi/ic_settings_gcpad.png | Bin 375 -> 0 bytes .../drawable-xxxhdpi/ic_settings_graphics.png | Bin 569 -> 0 bytes .../drawable-xxxhdpi/ic_settings_wiimote.png | Bin 862 -> 0 bytes .../main/res/drawable/ic_settings_core_tv.png | Bin 318 -> 0 bytes .../main/res/drawable/ic_settings_gcpad.png | Bin 375 -> 0 bytes .../res/drawable/ic_settings_graphics_tv.png | Bin 569 -> 0 bytes .../src/main/res/drawable/ic_settings_tv.png | Bin 0 -> 1026 bytes .../main/res/drawable/ic_settings_wiimote.png | Bin 862 -> 0 bytes .../main/res/layout/fragment_ingame_menu.xml | 15 ++++------- .../app/src/main/res/menu/menu_game_grid.xml | 24 +++--------------- .../app/src/main/res/values/strings.xml | 11 +++++--- 37 files changed, 49 insertions(+), 82 deletions(-) create mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_settings.png delete mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_settings_core.png delete mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_settings_gcpad.png delete mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_settings_graphics.png delete mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_settings_wiimote.png delete mode 100644 Source/Android/app/src/main/res/drawable-mdpi/ic_settings_gcpad.png delete 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.png delete mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_core.png delete mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_gcpad.png delete mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_graphics.png delete 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.png delete mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_core.png delete mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_gcpad.png delete mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_graphics.png delete 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.png delete mode 100644 Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_core.png delete mode 100644 Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_gcpad.png delete mode 100644 Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_graphics.png delete mode 100644 Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_wiimote.png delete mode 100644 Source/Android/app/src/main/res/drawable/ic_settings_core_tv.png delete mode 100644 Source/Android/app/src/main/res/drawable/ic_settings_gcpad.png delete mode 100644 Source/Android/app/src/main/res/drawable/ic_settings_graphics_tv.png create mode 100644 Source/Android/app/src/main/res/drawable/ic_settings_tv.png delete 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/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index 9bb3be3878..7ca2ae0c9e 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -99,7 +99,7 @@ public final class EmulationActivity extends AppCompatActivity MENU_ACTION_LOAD_SLOT6, MENU_ACTION_EXIT, MENU_ACTION_CHANGE_DISC, MENU_ACTION_RESET_OVERLAY, MENU_SET_IR_SENSITIVITY, MENU_ACTION_CHOOSE_DOUBLETAP, MENU_ACTION_MOTION_CONTROLS, MENU_ACTION_PAUSE_EMULATION, MENU_ACTION_UNPAUSE_EMULATION, - MENU_ACTION_OVERLAY_CONTROLS, MENU_ACTION_SETTINGS_CORE, MENU_ACTION_SETTINGS_GRAPHICS}) + MENU_ACTION_OVERLAY_CONTROLS, MENU_ACTION_SETTINGS}) public @interface MenuAction { } @@ -137,8 +137,7 @@ public final class EmulationActivity extends AppCompatActivity public static final int MENU_ACTION_PAUSE_EMULATION = 30; public static final int MENU_ACTION_UNPAUSE_EMULATION = 31; public static final int MENU_ACTION_OVERLAY_CONTROLS = 32; - public static final int MENU_ACTION_SETTINGS_CORE = 33; - public static final int MENU_ACTION_SETTINGS_GRAPHICS = 34; + public static final int MENU_ACTION_SETTINGS = 33; private static final SparseIntArray buttonsActionsMap = new SparseIntArray(); @@ -656,12 +655,8 @@ public final class EmulationActivity extends AppCompatActivity showMotionControlsOptions(); break; - case MENU_ACTION_SETTINGS_CORE: - SettingsActivity.launch(this, MenuTag.CONFIG); - break; - - case MENU_ACTION_SETTINGS_GRAPHICS: - SettingsActivity.launch(this, MenuTag.GRAPHICS); + case MENU_ACTION_SETTINGS: + SettingsActivity.launch(this, MenuTag.SETTINGS); break; case MENU_ACTION_EXIT: diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.java index 8422f2903b..721cd52a6a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.java @@ -4,6 +4,7 @@ import androidx.annotation.NonNull; public enum MenuTag { + SETTINGS("settings"), CONFIG("config"), CONFIG_GENERAL("config_general"), CONFIG_INTERFACE("config_interface"), diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java index 155cf1bfac..405040f391 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java @@ -35,7 +35,8 @@ public final class SettingsFragment extends Fragment implements SettingsFragment static { - titles.put(MenuTag.CONFIG, R.string.preferences_settings); + titles.put(MenuTag.SETTINGS, R.string.preferences_settings); + titles.put(MenuTag.CONFIG, R.string.config); titles.put(MenuTag.CONFIG_GENERAL, R.string.general_submenu); titles.put(MenuTag.CONFIG_INTERFACE, R.string.interface_submenu); titles.put(MenuTag.CONFIG_AUDIO, R.string.audio_submenu); @@ -43,10 +44,10 @@ public final class SettingsFragment extends Fragment implements SettingsFragment titles.put(MenuTag.CONFIG_GAME_CUBE, R.string.gamecube_submenu); titles.put(MenuTag.CONFIG_WII, R.string.wii_submenu); titles.put(MenuTag.CONFIG_ADVANCED, R.string.advanced_submenu); - titles.put(MenuTag.WIIMOTE, R.string.grid_menu_wiimote_settings); + titles.put(MenuTag.WIIMOTE, R.string.wiimote_settings); titles.put(MenuTag.WIIMOTE_EXTENSION, R.string.wiimote_extensions); - titles.put(MenuTag.GCPAD_TYPE, R.string.grid_menu_gcpad_settings); - titles.put(MenuTag.GRAPHICS, R.string.grid_menu_graphics_settings); + titles.put(MenuTag.GCPAD_TYPE, R.string.gcpad_settings); + titles.put(MenuTag.GRAPHICS, R.string.graphics_settings); titles.put(MenuTag.HACKS, R.string.hacks_submenu); titles.put(MenuTag.CONFIG_LOG, R.string.log_submenu); titles.put(MenuTag.DEBUG, R.string.debug_submenu); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java index 8f50dac6e1..622e552f63 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java @@ -122,6 +122,10 @@ public final class SettingsFragmentPresenter switch (mMenuTag) { + case SETTINGS: + addTopLevelSettings(sl); + break; + case CONFIG: addConfigSettings(sl); break; @@ -216,6 +220,20 @@ public final class SettingsFragmentPresenter mView.showSettingsList(mSettingsList); } + private void addTopLevelSettings(ArrayList sl) + { + sl.add(new SubmenuSetting(R.string.config, MenuTag.CONFIG)); + sl.add(new SubmenuSetting(R.string.graphics_settings, MenuTag.GRAPHICS)); + + if (!NativeLibrary.IsRunning()) + { + sl.add(new SubmenuSetting(R.string.gcpad_settings, MenuTag.GCPAD_TYPE)); + sl.add(new SubmenuSetting(R.string.wiimote_settings, MenuTag.WIIMOTE)); + } + + sl.add(new HeaderSetting(R.string.setting_clear_info, 0)); + } + private void addConfigSettings(ArrayList sl) { sl.add(new SubmenuSetting(R.string.general_submenu, MenuTag.CONFIG_GENERAL)); @@ -227,7 +245,6 @@ public final class SettingsFragmentPresenter sl.add(new SubmenuSetting(R.string.advanced_submenu, MenuTag.CONFIG_ADVANCED)); sl.add(new SubmenuSetting(R.string.log_submenu, MenuTag.CONFIG_LOG)); sl.add(new SubmenuSetting(R.string.debug_submenu, MenuTag.DEBUG)); - sl.add(new HeaderSetting(R.string.setting_clear_info, 0)); } private void addGeneralSettings(ArrayList sl) @@ -513,7 +530,6 @@ public final class SettingsFragmentPresenter sl.add(new HeaderSetting(R.string.graphics_enhancements_and_hacks, 0)); sl.add(new SubmenuSetting(R.string.enhancements_submenu, MenuTag.ENHANCEMENTS)); sl.add(new SubmenuSetting(R.string.hacks_submenu, MenuTag.HACKS)); - sl.add(new HeaderSetting(R.string.setting_clear_info, 0)); } private void addEnhanceSettings(ArrayList sl) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java index 90b3ee7d2d..555b20097d 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java @@ -48,9 +48,7 @@ public final class MenuFragment extends Fragment implements View.OnClickListener .append(R.id.menu_refresh_wiimotes, EmulationActivity.MENU_ACTION_REFRESH_WIIMOTES); buttonsActionsMap.append(R.id.menu_change_disc, EmulationActivity.MENU_ACTION_CHANGE_DISC); buttonsActionsMap.append(R.id.menu_exit, EmulationActivity.MENU_ACTION_EXIT); - buttonsActionsMap.append(R.id.menu_settings_core, EmulationActivity.MENU_ACTION_SETTINGS_CORE); - buttonsActionsMap.append(R.id.menu_settings_graphics, - EmulationActivity.MENU_ACTION_SETTINGS_GRAPHICS); + buttonsActionsMap.append(R.id.menu_settings, EmulationActivity.MENU_ACTION_SETTINGS); } public static MenuFragment newInstance() 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 75f2002ba3..8db0ee44a1 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 @@ -71,20 +71,8 @@ public final class MainPresenter { switch (itemId) { - case R.id.menu_settings_core: - mView.launchSettingsActivity(MenuTag.CONFIG); - return true; - - case R.id.menu_settings_graphics: - mView.launchSettingsActivity(MenuTag.GRAPHICS); - return true; - - case R.id.menu_settings_gcpad: - mView.launchSettingsActivity(MenuTag.GCPAD_TYPE); - return true; - - case R.id.menu_settings_wiimote: - mView.launchSettingsActivity(MenuTag.WIIMOTE); + case R.id.menu_settings: + mView.launchSettingsActivity(MenuTag.SETTINGS); return true; case R.id.menu_refresh: 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 23d1050d04..c7bc923461 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 @@ -313,21 +313,9 @@ public final class TvMainActivity extends FragmentActivity implements MainView { ArrayObjectAdapter rowItems = new ArrayObjectAdapter(new SettingsRowPresenter()); - rowItems.add(new TvSettingsItem(R.id.menu_settings_core, - R.drawable.ic_settings_core_tv, - R.string.grid_menu_config)); - - rowItems.add(new TvSettingsItem(R.id.menu_settings_graphics, - R.drawable.ic_settings_graphics_tv, - R.string.grid_menu_graphics_settings)); - - rowItems.add(new TvSettingsItem(R.id.menu_settings_gcpad, - 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.menu_settings, + R.drawable.ic_settings_tv, + R.string.grid_menu_settings)); rowItems.add(new TvSettingsItem(R.id.button_add_directory, R.drawable.ic_add_tv, diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..9059e0021a811f9204faf233c427916399a79b73 GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@?PWE(h45?szdz~?bDNyG4 z$A<zD3+dF9)(*Nfs8upd9Rz%XR*4G9sat5=RKFb#42Z+onH-Igx< zsN+oYGt%wy6Z>j?1MkN^UeK+{RFTSdc7iU`;~p`^e2mqj3p`@6l?5HkEjz7owMfepDP^ za>V*WoY4y=&Q*Dw?*C*$<8MEiV#&cRcZgxxS#G|QOU`@`&^BJw|M~87+lQNl7EP|? zX^T)2ldo*vX!^n{_YaTP+CMy#_CJ5~Kj2T(Ds$;(8yoS8rs}d+5xJ4i*Lm25-&)VFm_<)t)YnAr*{IrygZwRupk@ zPQMeb74`G0OZ0-x)05SX?K&TGq5ZRe&y(gRo3@9hcllEoW-JqDv@G)CQDzX>cS+Q8 z9p{sZ3vT=|GE**xMaqPn68dM!5OB2^-LJ!3)J z(vw0;Pv<>5o9DOsID7BbEl>S(w{Y+Lv|Vl8v0rXQx3pxRuipD$mi_-V4?pXB7Ow8e h{@ng1O`iD+OQ~{J@yq_-jSLJ744$rjF6*2UngFspTtxr? diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_gcpad.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_gcpad.png deleted file mode 100644 index 524a8c570a0f1e82d8d241adf0291197f293aa38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm_vVIA3mz(n|1>Tz$%8bid(r;L* z6g2t>x^V5BaMoARY44Yk=PorGZT$QTZJyYanQ^2pOx^Z$>q3Spe%qXGvb;ETX4@aL zDNJt_OSU$5s>&RZS@G|&&bgISmml8$_bvCCwy5oMxVOqV*_jAv)@8CPna&qv7V~?< kf1C5#@!HL%OBQMiIDA=QeNQ2jfq{X+)78&qol`;+0MsE?g#Z8m diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_graphics.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_graphics.png deleted file mode 100644 index a0a50b4fcbd55fe8c6898c6c24a1285b4c62ba6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm_RD;1WLHp z$5`Jw{B1|)u1k+qj8saN1i!p5@KNrgTwC0Qp4$iS&RbONZ*T1XURdU%zf0&8PEV0e zjo`1-R&-UC82ew%4wRfcC9d1aM`)jz>I{{iUl(<)PFy>}+Q>M+ZE{_%JE7X^Nk$t%13PAZr8FgBksE_$=N^VdZ7RWBEF zRXQ$En&l+oVK2P)@+y@qwa@!DEBgrTTD5r5?4~)(UcEh~ml;y#F>%%ZFKaeF7iv6L Wy?UzB;rR><3=E#GelF{r5}E)cp>gN{ 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 deleted file mode 100644 index 24a581832a9469d60801140ef77ba739b360404a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 386 zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4i*Lm25-&)VFm_9Pfr)ekP61P7n#=tB+9T~ z$hp1EFf}>L?B0)MImux&X5O8#Y>nc%o8M-wUB!P>#_edEdiXtCwwB);9CGNJD#@ zn`7`E_BWTTKP;`j&0LXPWO3!7tc{5thvq32|AOG%4l6otEq}WHbrsj!;`8kCwj2Bx z?%MBm%PQiCh~vSPIephpUCZ7a>h<}zv_;bct2K2+E9P21=*rx+dfBRX%XV|+WzFW$ z`W3c)O~BHSc+u5&F6cd6ExI)A(>*1P>PZfFb+>Nvnf7X$+%D}E@0PSTd6&IdXL@bN zbaAV7*ZRY9mw$5n+kLC~ljGFxTcMvFnY(W_e|B7c<=@3suYK$~eqW1x&RD5;M1& 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 deleted file mode 100644 index 545d95b68e9e9f4673e49bf46879af72cf5c3faf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4i*Lm2CurW#S9D#=RI86SQ=7>9-(oR-+$(S0$xIgETi{VB`-GwuA>l(SewmQfc__2CvU5#OijdHl?Wz@x# zw&S7kit9cT+m)t@ee`s?{UrW_%j9RvTl*M_uS^!W!ZxjeQCDGWREenux5MIT2Uh-Q zcg}X;`qq$YbRy-f-2}mPo8BgTe~DWM4ftFvvR diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..307389f3209785f92ea2cd30825b0a2ef77f3785 GIT binary patch literal 554 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?FvAspiY9jOXQ`X%wFI-|j@F^bk`H zW*NmiWSn{3ZxL5ca$0HJ2FaBl629gsv3@gkZu8e%`8m2Y*(c=tlsPXsf4x{_J3Ymg zXX$IVNQ22Q? zw5#j5*UX6!lHEvhc|+FhyVa&j@}kF<@RDh|>6_O4*I z`k@@JzA!I*ALF)HKRyK?eJ7mtU39jJsd3Z}PpPk8{eSU@Ycl6V2A6oNMWt1?2a4$} z+3lWw@Yd%{_?R$Jo8dIZ`G`1^`Hg$U*9Q-maVzA<&&HAcFXFy@vC+p zKd?Xc%GND&nbdY1I=(Z}eA^yIzGr#A#f%SdNC&d#JSqru%z5Bfd7pdU&DbrEbssKa zJbkys;>Z2#uWz3^xoG7CO|zb5hy0JOTeR}Rp}2E5d!yE_UHg|+V)LwREo}&nm!oa}5;OXk;vd$@?2>{BUMl1jT diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_gcpad.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_gcpad.png deleted file mode 100644 index 81280d05b116ab26846c0001a20ed798d6701927..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsBvproLLn;{GUOOu3s>tJ# zcxuP3w5UbKWg-)JEuYRk1iJ|YJZ}yMH2OfrRp3dHQ z*j?!de_8yiaHe1GB|ompJPQvC{@b?rzR}m&|F$%LyP=fBz{nzSKy)rch-{oz{--^< Q3=9kmp00i_>zopr0J_ss=>Px# diff --git a/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_graphics.png b/Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_graphics.png deleted file mode 100644 index 8d8bae42a42a66317a788e794fec69c91a33c9ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4i*LmhQHi~JPZsBpFLe1Ln;{GPTv~I8YtmX zczOYokjWC(E!;XwI94e*X&;y?#&NNOt>Am}=>^rgRsVfTzSi77Gx@HKkTp9a+lur_ z$u*^?Oup7LzOqyaY3~X+pkiq9)%w8<39Fy70^V!}4U9Yq4Qr&5bW{_j25Ck3v))+z ztFm4>{b7S5Tfp6mAL|yK7FGxp*{D?fw%ZvZ|#p?xXgl+BfTlAy4Tbp$DU#BOW$6}9O(uI1_lOCS3j3^P6p^^l>huV6ODy8^@LZ1qBKI`!Hc|Psc7B_Ro`hz1A(7u);Fp zY`DE;Ti%R7y6$sdBnMQ%bk;xPq=pF99t!xvuIjPpTW#+7Ftf$%L;TJF>dnP z>JSsCo*`*|X_oP$Q-R6?iN>cV_pMEA{&G2_*nsu&4{xJ?29diT=&$^-HdetkS!hq9 zjNToe2Xh6R%zwDdpI`oq`pzS1Pq4?bIvEQ3 zyUsY%-d47FCR1<%mrtYS4`;2qOmUxQuN diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..45d855b496b4e931cf040de9871bbe61b2a71dda GIT binary patch literal 788 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D5|ZhN{ohEy=Vz0K&75-q|0 zp;_S2qlXU_TaGHVd=TJQ%9*>rA7|Kc{r=4AeZ~9VFAG}`w)$$;)~JYM=6A0AiA{VN&Y8~XY`?z$e(>do zlWShDd|9A!-!IFmX6kztQ`vVqWY{H% z8&21s}Ni+Kh0tJzVh~5ojn_}c0Kyr&9DEb_4|d-d;ebNdTy&_Z+1j7 ztZ>a5uHW;*PiLH|ox1)=VQyKip6t0@H@8P=&9VG)X5Z}~#sjt!zU)k%k`D`d^aUAXr)j)1D!U;3@tiW# zuMRDPIew>FWDB)&T*Ny3)wa)86WKE9*AHXYLrU+S?B>*okbkmUvrO%<&AF$MevTI= zK9?w7e|4AS-qgzeeZSgn_^jvr{mRsxBFck=3m`DsVOnI zw*9i)g(9xDb6eO;{!Ozj&GD~xXn%EE`@Y4DMeQbL1{~T##t#B(Yu7BjWYDf`zrHKy zN22a$xiatVz57p=8>%u3#BUIgJ;(LWc<0(5Os3xA-V?vNsU8zpEu8muszmbyVcT^_ zq@Jx&d9z69wVl#}bw+v{LW-5Xxk-u}Mps#i=51&%)k$WRwm6XcFnfRg?~nFnLiQIg z%J^4^|F2qXxh>da&*8~8uj_uhC3-vUe$>m&5!a`5-@o>lzw7#qLrXuM`>@i@)8Npf z=sLd($L%9(78>6cf6w?@pC@Wg(gee^g6!S%+SS%??A&R{|HJu9bJI=9;=PsUS7$YB z{viBEcKQotx)ud@g_9_K82dk4XBP@fe*@XpR%za;@{{@^(iy$tf#-B=%ft zs*frv5n!!dBo(w`!IqN~r6-sKxR&&?{Ziaz&ugN#YbINizVNXsHp!F=jeKhtulb*- z(9C1ixclfIerCy(3G1D$PAD|bdoOrRp_wPj=JxX$^^1OAbA ziJwmY3;g^J%NtKg`x7*A-n;8fj%<=o{(obWOqt;5efZUiw0_l|{|pQa44$rjF6*2U FngEOvX3hWr diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_gcpad.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_gcpad.png deleted file mode 100644 index 1063b3d0ee12698b265d7817b03197bc566fcad2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84i*LmhW}5h&oD4BJoj{Q45?szd*k@b!wMoS z34yJ7Aq%J7PbcsR9QQF*nwd7nV(%==jxYiSir$2BRA%kFCG-Oiud7dBgwDfP96uPFav;d1l3+8HyS%xdW3{A};D*`(Si|JvvA$eWB_6W3J%5SxxJVTDp0Pukw814*!|V_Uc$@ z)maDb9j7))o=E(}tfIik>EXa6Gy!Y|XGY_Bou@)Cw7U}CHLT)$Ua^xg>*1$|b7uGK zX8bzQYO{@jyR` x(}aIW)xSu+xjcAhdwk5)+Umtzpb)sg=kxkq*%Xm2`V0&V44$rjF6*2UngGh4!s`G4 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 deleted file mode 100644 index 32e7995e37d6c229441048d2beba6251d25e7fdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 653 zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84i*LmhW}5h&oD4Bg?PF+hEy=Vy~*4o>&S5I zDpWb)KTxEjU1oqR;+#CF# zSg?04VR7?Z{&cCe_l^_Xhdj4QpDWheG-KU~kCQzGExe8|wEQxyC-<qc4>}HS@Z*Cy|s?(Gd`TZ;-gQu&X%Q~loCIHv7 BB_#j= diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..46180dd6f35b8c47229be2f9253e6e9f6eac7228 GIT binary patch literal 1026 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^S>PkOpIhEy=Vy~F5|5-q{- zpjm(|abtvzQ$))L2Eju~f`^oJ#JV?dDC#(ID7Jjqz@gZ3^g*Hlha%6RB!NQ-1s`o6 zY?R2`Uj1%n)&JwH5|8f{zyEpu|NrMp1VHKqoH+h-Ry60nG1;^2g7?Fh8@f(?_WfYj zy8PhIZ!$}lb4p~L53QQj;Qn@}_gB_E7uRWB75^~(o9^-|CcEtWX{*#9w12Dh{>t)a zZSC=u^BNc(S{AWBIC$Abql@*;V;Sp+oFCHBpH_U(G;NUE_ef@Urrg6T^W_Sg_)YWw z@VR~3eK>3tW46W7BlEw-M?K0hc)j+3RNF4|1E=0x%*)vJGDh{sh4AyrejA!tWfleb zweG#SSax&llFA0%vpr|~H>O<+_KY}k;{SDCu^`PG;`^2feGn6V$mpG_9rnv@&t6$KORetJh3> z|M?sIK1@v@5oK7mFvG5GuIsOu-4L9 zerCfuTjxF6JExW`ik*IR(fnt}ZoIJiSf(`p?U~OZe4_i7-}%7DTD`_hs*wB z=gp1gRX=*PpT2oMuVwkESxF7va~|=8ODqbyR{QO!Bwx!j#gc6q8ef9LH|R1rT&=7Z z_$SEVcX}?rpxj5bsSU=7+e@M!Ew&6v(07phv2Nz6KP$NA9En)+boU`vvyCm@Ph}Uk z>wbw(DQ7XuUL)}RLz$b$?*-N65%VX0wmRgz?^P_@j#;L+vfmx})41}_u^UH|dRd>F z{gRX_*_;>q>b%rjQ~4tcZPb3W9c`QWK>15yOY4_e3oq@PE%NH%+;6c<0{GW$d2i5K zRS@$bV`D@9t?d(?Y;RoISFU-bIrZ(VWs8(V_WHWIYE;dfr}kh~0*BOwz#VUG6GW>m kGAe5SKYrE@&u2_4K1(emdKI;Vst0HMwDr2qf` literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_core.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_core.png deleted file mode 100644 index 361bc89afd528ab625fb7589a39335e3544895aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWvU<8WhEy=Vz1sP zTW7;L%W#+SqmtQYo-(;@JGpk_xe2TimP;1Zw#ghY3tgMaAhu$)p*VlU@=a4K4p>f| zdxUx2iZ@0K6FxXjDfr1WiGhiQL*PT)`#E;M{!9fK&LQx@ZpE)3EMU_)K1_}PGklKN z7lTwP9N@j19#SU5AF+7T(uxBzy{n{*CpP?Qoc(l8=i0_vty@daGujAT%S^czvFyC; z?m5Y=!g`(WCM8d^`*o+hC>(6o4&^xzixeCV*uHU{JDY1NV;utn1B0ilpUXO@geCyz C8gjY- diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_gcpad.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_gcpad.png deleted file mode 100644 index cb8e91181da45d6a5c04b3a6aae3809169b1386e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CW+IhM-hEy=Vy>)cvVFv-1 zMBP#oE6s*hiQa>2lrL5`8C)~!nYs4U_f_Yc;w?f>>|tPFV0hrc3Zf9$>uYHCl4Yq& zqH3qUW?a~}EUReQD~&KlCuYl(1rdBNPN=?3Z3qh9nX;-#@WS-qU)>E+ek;Wpl`T`Z zaNIC+joTHlPKtryfRAk`SF6@nlVWBS+f?_8up*{2`~2y}%O=hw13~p-FWng%tZt-UMj5q2(-z<-O ztG=stn$#XGBL}w(^SX`h(fr>|=SFNq^EAl&4|ub`SH26Aj%fq&JYD@<);T3K0RaE1 Bh2Q`H diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_graphics.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_graphics.png deleted file mode 100644 index d99de55020b842e4ce8c786e8463cb53b80ddc45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 569 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWF?hN-hEy=Vy{)<>Bv9no z$6oK`s)i=(FD>8qeQ5g9^5xr|`)_5-jZE(RJ{0?Y{t-9#bE$JJpRfB~8!z*>wf5VJ zz|UL?4Gc^i3JnZ_+6S!Kb{tpVHP`=6>IBpO>@$u_WCj}@xwERFGDfvMCN0nOfW*#} z4O|JbKbNHVS|oJLxg^iG!`*MEEZ+|ozn>C(Cv?FEVI#h>^#op#ESS6V%=5HZ#`6&! zi8{|?Wf||^c=vt(=DvnxiMXy^jDCi)hhI;gAY77WWSK)o+f@+Ty|aIZ()xe?Y~B{msEy zTMpLNJ^Au}wRVD#67#VQVzH;Z8RlI$z_e@f4~F>IYn!5fo^m%!YSewiTvNLBW#YGF z#;=|ooFA@=F16zu ymuLI1ZsGjfH9iFe_ZCeL{iPg(h%%-c_Nl&RbHB`S>ttYHVDNPHb6Mw<&;$TAnDtHo 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 deleted file mode 100644 index fc8be98566621b6af1143adcb9ebd3e17e1feea6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWt9rUPhEy=Vz2!V7CQ|0; z$LnSNx#GvR<=)Q9J0^TP>S$Tm#*Ll1x62IwEWPG=b^nJs=WWv?cin$BwQb_rhj#mx zsyfd+TE!>$&}WSx-^O{7JWE;c7sy*?91A_%k@k_}>rA%^AwmgSrIj;u(i!9yDO;aV zx&7h*a~TuYk51PYXKU&d?pHY&{@)jc3ffyk+?TodbW@Fg=-*z!$sXneLw$XT_Tv#fo_A?k#FtcjmE*Lb_y~F~fZ! zw^M4jK6-KO?{eMa#lB5J^@R8_rcD{nk6Kz63HdrWD3BE@(jk>{iELd&NaR@ItoJB93(PZ&P3zA&R==83f#Y+w173F&_=tz~C% zYKXtUlgGO7OS?V;%OS6KZpI7auAMsUFRLKv7Odp|v0`4m#F3aXfhRs|9Lo%*H~u-h z`O}tOBQ*|?5`kUZpQkGAOA}FC!XkNa`l0&nm|qNE&(8AN(>ZN{`GtAPOJ+H5dAO_P zfAPI7Rjy^4vK^E14sBU_hf{mg`J3*`ZXQ zk}uKxKf)uXoLRv6zL@`M%JHakwtM`I)3~}9+Uv4%6fe>JbMz`_e4+0D4WaWs&)^f_ zsQ#ha%2}Ydf3v^bzD|Zlg9h*5x~orlCbs9>IH=8e@SG=Y{_=)jemA7o9?zEC`%d?t z`)2usVo?W15eLQ(#%%&G)lOvC_%Zyja9d{Cb-eC?#FvyMe;Wj4A<%bQ=uLAFX}H?GnQ%z-O;@mmxxDUYTC0-2$hYvaO#P z%RA41vyfMiR}$4|c**dSL_KGoHc9o5WbC_|hA-_~*zPcNd~mvxzR%@~ zEJH^?;XVE!F;kbjrgP)GOy#(ez6PBx+PWZ+fi(a(DiBh5@r~Pm@x{r4-as v%v;T1l&HdZ$+to9SNnRseOe7nbC~Z;RF-|Q@=X&10|SGntDnm{r-UW|q5gHa diff --git a/Source/Android/app/src/main/res/drawable/ic_settings_core_tv.png b/Source/Android/app/src/main/res/drawable/ic_settings_core_tv.png deleted file mode 100644 index 361bc89afd528ab625fb7589a39335e3544895aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWvU<8WhEy=Vz1sP zTW7;L%W#+SqmtQYo-(;@JGpk_xe2TimP;1Zw#ghY3tgMaAhu$)p*VlU@=a4K4p>f| zdxUx2iZ@0K6FxXjDfr1WiGhiQL*PT)`#E;M{!9fK&LQx@ZpE)3EMU_)K1_}PGklKN z7lTwP9N@j19#SU5AF+7T(uxBzy{n{*CpP?Qoc(l8=i0_vty@daGujAT%S^czvFyC; z?m5Y=!g`(WCM8d^`*o+hC>(6o4&^xzixeCV*uHU{JDY1NV;utn1B0ilpUXO@geCyz C8gjY- diff --git a/Source/Android/app/src/main/res/drawable/ic_settings_gcpad.png b/Source/Android/app/src/main/res/drawable/ic_settings_gcpad.png deleted file mode 100644 index cb8e91181da45d6a5c04b3a6aae3809169b1386e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CW+IhM-hEy=Vy>)cvVFv-1 zMBP#oE6s*hiQa>2lrL5`8C)~!nYs4U_f_Yc;w?f>>|tPFV0hrc3Zf9$>uYHCl4Yq& zqH3qUW?a~}EUReQD~&KlCuYl(1rdBNPN=?3Z3qh9nX;-#@WS-qU)>E+ek;Wpl`T`Z zaNIC+joTHlPKtryfRAk`SF6@nlVWBS+f?_8up*{2`~2y}%O=hw13~p-FWng%tZt-UMj5q2(-z<-O ztG=stn$#XGBL}w(^SX`h(fr>|=SFNq^EAl&4|ub`SH26Aj%fq&JYD@<);T3K0RaE1 Bh2Q`H diff --git a/Source/Android/app/src/main/res/drawable/ic_settings_graphics_tv.png b/Source/Android/app/src/main/res/drawable/ic_settings_graphics_tv.png deleted file mode 100644 index d99de55020b842e4ce8c786e8463cb53b80ddc45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 569 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWF?hN-hEy=Vy{)<>Bv9no z$6oK`s)i=(FD>8qeQ5g9^5xr|`)_5-jZE(RJ{0?Y{t-9#bE$JJpRfB~8!z*>wf5VJ zz|UL?4Gc^i3JnZ_+6S!Kb{tpVHP`=6>IBpO>@$u_WCj}@xwERFGDfvMCN0nOfW*#} z4O|JbKbNHVS|oJLxg^iG!`*MEEZ+|ozn>C(Cv?FEVI#h>^#op#ESS6V%=5HZ#`6&! zi8{|?Wf||^c=vt(=DvnxiMXy^jDCi)hhI;gAY77WWSK)o+f@+Ty|aIZ()xe?Y~B{msEy zTMpLNJ^Au}wRVD#67#VQVzH;Z8RlI$z_e@f4~F>IYn!5fo^m%!YSewiTvNLBW#YGF z#;=|ooFA@=F16zu ymuLI1ZsGjfH9iFe_ZCeL{iPg(h%%-c_Nl&RbHB`S>ttYHVDNPHb6Mw<&;$TAnDtHo diff --git a/Source/Android/app/src/main/res/drawable/ic_settings_tv.png b/Source/Android/app/src/main/res/drawable/ic_settings_tv.png new file mode 100644 index 0000000000000000000000000000000000000000..46180dd6f35b8c47229be2f9253e6e9f6eac7228 GIT binary patch literal 1026 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^S>PkOpIhEy=Vy~F5|5-q{- zpjm(|abtvzQ$))L2Eju~f`^oJ#JV?dDC#(ID7Jjqz@gZ3^g*Hlha%6RB!NQ-1s`o6 zY?R2`Uj1%n)&JwH5|8f{zyEpu|NrMp1VHKqoH+h-Ry60nG1;^2g7?Fh8@f(?_WfYj zy8PhIZ!$}lb4p~L53QQj;Qn@}_gB_E7uRWB75^~(o9^-|CcEtWX{*#9w12Dh{>t)a zZSC=u^BNc(S{AWBIC$Abql@*;V;Sp+oFCHBpH_U(G;NUE_ef@Urrg6T^W_Sg_)YWw z@VR~3eK>3tW46W7BlEw-M?K0hc)j+3RNF4|1E=0x%*)vJGDh{sh4AyrejA!tWfleb zweG#SSax&llFA0%vpr|~H>O<+_KY}k;{SDCu^`PG;`^2feGn6V$mpG_9rnv@&t6$KORetJh3> z|M?sIK1@v@5oK7mFvG5GuIsOu-4L9 zerCfuTjxF6JExW`ik*IR(fnt}ZoIJiSf(`p?U~OZe4_i7-}%7DTD`_hs*wB z=gp1gRX=*PpT2oMuVwkESxF7va~|=8ODqbyR{QO!Bwx!j#gc6q8ef9LH|R1rT&=7Z z_$SEVcX}?rpxj5bsSU=7+e@M!Ew&6v(07phv2Nz6KP$NA9En)+boU`vvyCm@Ph}Uk z>wbw(DQ7XuUL)}RLz$b$?*-N65%VX0wmRgz?^P_@j#;L+vfmx})41}_u^UH|dRd>F z{gRX_*_;>q>b%rjQ~4tcZPb3W9c`QWK>15yOY4_e3oq@PE%NH%+;6c<0{GW$d2i5K zRS@$bV`D@9t?d(?Y;RoISFU-bIrZ(VWs8(V_WHWIYE;dfr}kh~0*BOwz#VUG6GW>m kGAe5SKYrE@&u2_4K1(emdKI;Vst0HMwDr2qf` 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 deleted file mode 100644 index fc8be98566621b6af1143adcb9ebd3e17e1feea6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4i*Lm29JsRH#0CWt9rUPhEy=Vz2!V7CQ|0; z$LnSNx#GvR<=)Q9J0^TP>S$Tm#*Ll1x62IwEWPG=b^nJs=WWv?cin$BwQb_rhj#mx zsyfd+TE!>$&}WSx-^O{7JWE;c7sy*?91A_%k@k_}>rA%^AwmgSrIj;u(i!9yDO;aV zx&7h*a~TuYk51PYXKU&d?pHY&{@)jc3ffyk+?TodbW@Fg=-*z!$sXneLw$XT_Tv#fo_A?k#FtcjmE*Lb_y~F~fZ! zw^M4jK6-KO?{eMa#lB5J^@R8_rcD{nk6Kz63HdrWD3BE@(jk>{iELd&NaR@ItoJB93(PZ&P3zA&R==83f#Y+w173F&_=tz~C% zYKXtUlgGO7OS?V;%OS6KZpI7auAMsUFRLKv7Odp|v0`4m#F3aXfhRs|9Lo%*H~u-h z`O}tOBQ*|?5`kUZpQkGAOA}FC!XkNa`l0&nm|qNE&(8AN(>ZN{`GtAPOJ+H5dAO_P zfAPI7Rjy^4vK^E14sBU_hf{mg`J3*`ZXQ zk}uKxKf)uXoLRv6zL@`M%JHakwtM`I)3~}9+Uv4%6fe>JbMz`_e4+0D4WaWs&)^f_ zsQ#ha%2}Ydf3v^bzD|Zlg9h*5x~orlCbs9>IH=8e@SG=Y{_=)jemA7o9?zEC`%d?t z`)2usVo?W15eLQ(#%%&G)lOvC_%Zyja9d{Cb-eC?#FvyMe;Wj4A<%bQ=uLAFX}H?GnQ%z-O;@mmxxDUYTC0-2$hYvaO#P z%RA41vyfMiR}$4|c**dSL_KGoHc9o5WbC_|hA-_~*zPcNd~mvxzR%@~ zEJH^?;XVE!F;kbjrgP)GOy#(ez6PBx+PWZ+fi(a(DiBh5@r~Pm@x{r4-as v%v;T1l&HdZ$+to9SNnRseOe7nbC~Z;RF-|Q@=X&10|SGntDnm{r-UW|q5gHa diff --git a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml index 8beb206850..b24e9a1b33 100644 --- a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml +++ b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml @@ -31,16 +31,6 @@ android:layout_height="wrap_content" android:orientation="vertical"> -