diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-09-02 05:31:48 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-09-02 05:31:48 -0500 |
| commit | 2897619ddbd3e3aae8427fc503647c65e770d466 (patch) | |
| tree | c049e0f59dcf80e7ce2d0e47db4698a98a4a6332 /Source/Android | |
| parent | e7157e7c5285e668cef909409c319597336beda2 (diff) | |
Removal of my terrible idea.
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/res/xml/video_prefs.xml | 3 | ||||
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java | 16 |
2 files changed, 6 insertions, 13 deletions
diff --git a/Source/Android/res/xml/video_prefs.xml b/Source/Android/res/xml/video_prefs.xml index 6ec29c13a0..311c6ce8a9 100644 --- a/Source/Android/res/xml/video_prefs.xml +++ b/Source/Android/res/xml/video_prefs.xml @@ -129,9 +129,10 @@ android:key="showFPS" android:summary="@string/show_fps_descrip" android:title="@string/show_fps"/> - + <!-- <CheckBoxPreference android:defaultValue="true" android:key="drawOnscreenControls" android:title="@string/draw_onscreen_controls"/> + --> </PreferenceScreen>
\ No newline at end of file diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java index 71f896097c..09c7c86e70 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java @@ -1,9 +1,5 @@ package org.dolphinemu.dolphinemu; -import java.util.List; - -import org.dolphinemu.dolphinemu.settings.InputConfigFragment; - import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -11,15 +7,11 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.util.DisplayMetrics; -import android.view.InputDevice; -import android.view.KeyEvent; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; -import android.view.MotionEvent; -import android.view.Window; -import android.view.WindowManager; +import android.view.*; import android.view.WindowManager.LayoutParams; +import org.dolphinemu.dolphinemu.settings.InputConfigFragment; + +import java.util.List; /** * This is the activity where all of the emulation handling happens. |
