diff options
| author | Lioncash <mathew1800@gmail.com> | 2013-10-27 22:15:49 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2013-10-27 22:15:49 -0400 |
| commit | 4e999fe0ee1100ef4bee2e3fefe908222a5c2e92 (patch) | |
| tree | 721f356692f9c3230d5e7f75063028291936559c /Source/Android/src | |
| parent | d1834b30584f064354addbde0c15265f55e9d872 (diff) | |
[Android] General cleanup.
We no longer need the buttons in Assets, considering they are now resources (ie. drawables).
Also remove (now) junk code from VideoSettingsFragment.java. We handle the input overlay within the InputSettingsFragment.
Also add a TODO detailing what needs to be refactored when axis support is finally added.
Diffstat (limited to 'Source/Android/src')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java | 2 | ||||
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java index d33beee45d..651df513e9 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlay.java @@ -65,6 +65,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener public boolean onTouch(View v, MotionEvent event) { // Determine the button state to apply based on the MotionEvent action flag. + // TODO: This will not work when Axis support is added. Make sure to refactor this when that time comes + // The reason it won't work is that when moving an axis, you would get the event MotionEvent.ACTION_MOVE. int buttonState = (event.getAction() == MotionEvent.ACTION_DOWN) ? ButtonState.PRESSED : ButtonState.RELEASED; for (InputOverlayDrawable item : overlayItems) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java index 47f9ef475f..c5d22ff821 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java @@ -241,14 +241,12 @@ public final class VideoSettingsFragment extends PreferenceFragment mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(3).setEnabled(false); - //mainScreen.getPreference(4).setEnabled(true); } else if (videoBackends.getValue().equals("OGL")) { mainScreen.getPreference(0).setEnabled(true); mainScreen.getPreference(1).setEnabled(true); mainScreen.getPreference(3).setEnabled(true); - //mainScreen.getPreference(4).setEnabled(false); } // Also set a listener, so that if someone changes the video backend, it will disable @@ -265,14 +263,12 @@ public final class VideoSettingsFragment extends PreferenceFragment mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(3).setEnabled(false); - //mainScreen.getPreference(4).setEnabled(true); } else if (preference.getString(key, "Software Renderer").equals("OGL")) { mainScreen.getPreference(0).setEnabled(true); mainScreen.getPreference(1).setEnabled(true); mainScreen.getPreference(3).setEnabled(true); - //mainScreen.getPreference(4).setEnabled(false); } } } |