mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-10 12:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Wiimote UI Fixup

Browse Source
This commit is contained in:
sigmabeta 2015-07-23 23:17:16 -04:00
parent 008ac0eeb0
commit 1cb07b1c48
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Android/app/src/main/res/xml/preferences.xml
View File

@ -575,7 +575,7 @@
android:title="@string/wiimote_bindings"> android:title="@string/wiimote_bindings">
<PreferenceScreen <PreferenceScreen
android:key="wiimote_bindings_0" android:key="wiimote_bindings_4"
android:title="@string/controller_0"> android:title="@string/controller_0">
<CheckBoxPreference <CheckBoxPreference
@ -584,67 +584,67 @@
<org.dolphinemu.dolphinemu.utils.InputBindingPreference <org.dolphinemu.dolphinemu.utils.InputBindingPreference
android:dependency="enableWiimote1" android:dependency="enableWiimote1"
android:key="WiimoteA_0" android:key="WiimoteA_4"
android:summary="%s" android:summary="%s"
android:title="@string/button_a"/> android:title="@string/button_a"/>
<org.dolphinemu.dolphinemu.utils.InputBindingPreference <org.dolphinemu.dolphinemu.utils.InputBindingPreference
android:dependency="enableWiimote1" android:dependency="enableWiimote1"
android:key="WiimoteB_0" android:key="WiimoteB_4"
android:summary="%s" android:summary="%s"
android:title="@string/button_b"/> android:title="@string/button_b"/>
<org.dolphinemu.dolphinemu.utils.InputBindingPreference <org.dolphinemu.dolphinemu.utils.InputBindingPreference
android:dependency="enableWiimote1" android:dependency="enableWiimote1"
android:key="WiimoteMinus_0" android:key="WiimoteMinus_4"
android:summary="%s" android:summary="%s"
android:title="@string/button_minus"/> android:title="@string/button_minus"/>
<org.dolphinemu.dolphinemu.utils.InputBindingPreference <org.dolphinemu.dolphinemu.utils.InputBindingPreference
android:dependency="enableWiimote1" android:dependency="enableWiimote1"
android:key="WiimotePlus_0" android:key="WiimotePlus_4"
android:summary="%s" android:summary="%s"
android:title="@string/button_plus"/> android:title="@string/button_plus"/>
<org.dolphinemu.dolphinemu.utils.InputBindingPreference <org.dolphinemu.dolphinemu.utils.InputBindingPreference
android:dependency="enableWiimote1" android:dependency="enableWiimote1"
android:key="WiimoteHome_0" android:key="WiimoteHome_4"
android:summary="%s" android:summary="%s"
android:title="@string/button_home"/> android:title="@string/button_home"/>
<org.dolphinemu.dolphinemu.utils.InputBindingPreference <org.dolphinemu.dolphinemu.utils.InputBindingPreference
android:dependency="enableWiimote1" android:dependency="enableWiimote1"
android:key="Wiimote1_0" android:key="Wiimote1_4"
android:summary="%s" android:summary="%s"
android:title="@string/button_one"/> android:title="@string/button_one"/>
<org.dolphinemu.dolphinemu.utils.InputBindingPreference <org.dolphinemu.dolphinemu.utils.InputBindingPreference
android:dependency="enableWiimote1" android:dependency="enableWiimote1"
android:key="Wiimote2_0" android:key="Wiimote2_4"
android:summary="%s" android:summary="%s"
android:title="@string/button_two"/> android:title="@string/button_two"/>
<org.dolphinemu.dolphinemu.utils.InputBindingPreference <org.dolphinemu.dolphinemu.utils.InputBindingPreference
android:dependency="enableWiimote1" android:dependency="enableWiimote1"
android:key="WiimoteUp_0" android:key="WiimoteUp_4"
android:summary="%s" android:summary="%s"
android:title="@string/dpad_up"/> android:title="@string/dpad_up"/>
<org.dolphinemu.dolphinemu.utils.InputBindingPreference <org.dolphinemu.dolphinemu.utils.InputBindingPreference
android:dependency="enableWiimote1" android:dependency="enableWiimote1"
android:key="WiimoteDown_0" android:key="WiimoteDown_4"
android:summary="%s" android:summary="%s"
android:title="@string/dpad_down"/> android:title="@string/dpad_down"/>
<org.dolphinemu.dolphinemu.utils.InputBindingPreference <org.dolphinemu.dolphinemu.utils.InputBindingPreference
android:dependency="enableWiimote1" android:dependency="enableWiimote1"
android:key="WiimoteLeft_0" android:key="WiimoteLeft_4"
android:summary="%s" android:summary="%s"
android:title="@string/dpad_left"/> android:title="@string/dpad_left"/>
<org.dolphinemu.dolphinemu.utils.InputBindingPreference <org.dolphinemu.dolphinemu.utils.InputBindingPreference
android:dependency="enableWiimote1" android:dependency="enableWiimote1"
android:key="WiimoteRight_0" android:key="WiimoteRight_4"
android:summary="%s" android:summary="%s"
android:title="@string/dpad_right"/> android:title="@string/dpad_right"/>

2
Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
View File

@ -36,7 +36,7 @@ std::string Touchscreen::GetSource() const
int Touchscreen::GetId() const int Touchscreen::GetId() const
{ {
return 0; return _padID;
} }
Touchscreen::Touchscreen(int padID) Touchscreen::Touchscreen(int padID)
: _padID(padID) : _padID(padID)