diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-29 21:12:24 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-29 21:12:36 -0600 |
| commit | 00a25cdaf5379a5ea3879ad7743cce47c9f44d65 (patch) | |
| tree | 1f0569b632fe698a79c5cdb67bc4bda46937d436 /Source/Android | |
| parent | f6e89356c7d6156b73d9c82824a840b14bc7e448 (diff) | |
[Android-overlay] Disable Wiimote configuration until it is wired up.
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/res/xml/input_prefs.xml | 3 | ||||
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/Android/res/xml/input_prefs.xml b/Source/Android/res/xml/input_prefs.xml index ed85d634a8..c97375ccae 100644 --- a/Source/Android/res/xml/input_prefs.xml +++ b/Source/Android/res/xml/input_prefs.xml @@ -446,6 +446,7 @@ </PreferenceScreen> <!-- Wiimote controller bindings --> + <!-- <PreferenceScreen android:key="wiimote_bindings" android:title="@string/wiimote_bindings"> @@ -1042,5 +1043,5 @@ android:key="WiimoteShakeZ_4" android:title="@string/shake_z"/> </PreferenceScreen> - </PreferenceScreen> + </PreferenceScreen> --> </PreferenceScreen>
\ No newline at end of file diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java index d3d23d378a..3f32a7de1c 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java @@ -6,18 +6,17 @@ package org.dolphinemu.dolphinemu.settings.input; -import java.util.List; - import android.app.Fragment; import android.os.Build; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceFragment; import android.view.InputDevice; - import org.dolphinemu.dolphinemu.NativeLibrary; import org.dolphinemu.dolphinemu.R; +import java.util.List; + /** * The {@link Fragment} responsible for implementing the functionality * within the input control mapping config. @@ -64,12 +63,12 @@ public final class InputConfigFragment extends PreferenceFragment } // Loop through the keys for the Wiimote - for (String key : wiimoteKeys) + /*for (String key : wiimoteKeys) { final String binding = NativeLibrary.GetConfig("Dolphin.ini", "Android", key+"_"+i, "None"); final Preference pref = findPreference(key+"_"+i); pref.setSummary(binding); - } + }*/ } } |