[Android] Migrate the "Draw Onscreen Controls" preference to the video settings.

3 files changed, 8 insertions, 4 deletions

diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
index f84e12359c..8b58d9abaf 100644
--- a/Source/Android/res/values-ja/strings.xml
+++ b/Source/Android/res/values-ja/strings.xml
@@ -30,7 +30,6 @@
     <string name="file_clicked">クリックされたファイル： </string>
     
     <!-- Input Config Fragment -->
-    <string name="draw_onscreen_controls">画面上のコントロールを描画</string>
     <string name="button_a">Aボタン</string>
     <string name="button_b">Bボタン</string>
     <string name="button_start">スタートボタン</string>
@@ -66,12 +65,12 @@
     <string name="emu_core_to_use">使用するエミュレーションコア</string>
     <string name="dual_core">デュアルコア</string>
     <string name="on_off">有効/無効</string>
-    
     <string name="video_settings">ビデオ設定</string>
     <string name="software_renderer">Software Renderer</string>
     <string name="opengl_es3">OpenGL ES 3</string>
     <string name="video_backend">ビデオレンダラ</string>
     <string name="video_backend_to_use">使用するビデオレンダラー</string>
+    <string name="draw_onscreen_controls">画面上のコントロールを描画</string>
     
     <string name="enhancements">画質向上の設定</string>
     <string name="internal_resolution">内部解像度の変更</string>
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index 009387ff77..01883fabd1 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -30,7 +30,6 @@
     <string name="file_clicked">File clicked: </string>
 
     <!-- Input Config Fragment -->
-    <string name="draw_onscreen_controls">Draw on-screen controls</string>
     <string name="button_a">Button A</string>
     <string name="button_b">Button B</string>
     <string name="button_start">Button Start</string>
@@ -55,7 +54,7 @@
     <string name="drawing_onscreen_controls">Drawing on-screen controls</string>
     <string name="press_button_to_config">Press button to configure %1$s</string>
 
-    <!-- Prefs Fragment -->
+    <!-- Preference Related -->
     <string name="interpreter">Interpreter</string>
     <string name="jit64_recompiler">JIT64 Recompiler</string>
     <string name="jitil_recompiler">JITIL Recompiler</string>
@@ -70,6 +69,7 @@
     <string name="opengl_es3">OpenGL ES 3</string>
     <string name="video_backend">Video Backend</string>
     <string name="video_backend_to_use">Video backend to use</string>
+    <string name="draw_onscreen_controls">Draw on-screen controls</string>
     
     <string name="enhancements">Enhancements</string>
     <string name="internal_resolution">Internal Resolution</string>
diff --git a/Source/Android/res/xml/video_prefs.xml b/Source/Android/res/xml/video_prefs.xml
index 2abd8deabf..ec0c1837f7 100644
--- a/Source/Android/res/xml/video_prefs.xml
+++ b/Source/Android/res/xml/video_prefs.xml
@@ -124,4 +124,9 @@
            android:key="gpuPref"
            android:summary="@string/video_backend_to_use"
            android:title="@string/video_backend" />
+    
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="drawOnscreenControls"
+        android:title="@string/draw_onscreen_controls"/>
 </PreferenceScreen>
\ No newline at end of file