From b6bd48584f5e79771d763458dcf61b1bc37aa8e0 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Thu, 7 Jan 2016 00:20:46 -0600
Subject: [PATCH] Refactor to match other preference conventions

---
 app/src/main/java/com/limelight/Game.java              |  2 +-
 .../limelight/preferences/PreferenceConfiguration.java | 10 ++++------
 app/src/main/res/xml/preferences.xml                   |  6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/limelight/Game.java b/app/src/main/java/com/limelight/Game.java
index dedf4786..3824aa3f 100644
--- a/app/src/main/java/com/limelight/Game.java
+++ b/app/src/main/java/com/limelight/Game.java
@@ -287,7 +287,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             evdevHandler.start();
         }
 
-        if (prefConfig.virtualController_enable) {
+        if (prefConfig.onscreenController) {
             // create virtual onscreen controller
             virtualController = new VirtualController(conn,
                     (FrameLayout)findViewById(R.id.surfaceView).getParent(),
diff --git a/app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java b/app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java
index 260b6388..6b87de36 100644
--- a/app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java
+++ b/app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java
@@ -21,9 +21,7 @@ public class PreferenceConfiguration {
     private static final String ENABLE_51_SURROUND_PREF_STRING = "checkbox_51_surround";
     private static final String USB_DRIVER_PREF_SRING = "checkbox_usb_driver";
     private static final String VIDEO_FORMAT_PREF_STRING = "video_format";
-
-    private static final String VIRTUAL_CONTROLLER_ENABLE = "virtual_controller_checkbox_enable";
-    private static final Boolean VIRTUAL_CONTROLLER_ENABLE_DEFAULT = true;
+    private static final String ONSCREEN_CONTROLLER_PREF_STRING = "checkbox_onscreen_controller";
 
     private static final int BITRATE_DEFAULT_720_30 = 5;
     private static final int BITRATE_DEFAULT_720_60 = 10;
@@ -45,6 +43,7 @@ public class PreferenceConfiguration {
     private static final boolean DEFAULT_ENABLE_51_SURROUND = false;
     private static final boolean DEFAULT_USB_DRIVER = true;
     private static final String DEFAULT_VIDEO_FORMAT = "auto";
+    private static final boolean ONSCREEN_CONTROLLER_DEFAULT = true;
 
     public static final int FORCE_H265_ON = -1;
     public static final int AUTOSELECT_H265 = 0;
@@ -57,8 +56,7 @@ public class PreferenceConfiguration {
     public boolean stretchVideo, enableSops, playHostAudio, disableWarnings;
     public String language;
     public boolean listMode, smallIconMode, multiController, enable51Surround, usbDriver;
-
-    public boolean virtualController_enable;
+    public boolean onscreenController;
 
     public static int getDefaultBitrate(String resFpsString) {
         if (resFpsString.equals("720p30")) {
@@ -188,7 +186,7 @@ public class PreferenceConfiguration {
         config.multiController = prefs.getBoolean(MULTI_CONTROLLER_PREF_STRING, DEFAULT_MULTI_CONTROLLER);
         config.enable51Surround = prefs.getBoolean(ENABLE_51_SURROUND_PREF_STRING, DEFAULT_ENABLE_51_SURROUND);
         config.usbDriver = prefs.getBoolean(USB_DRIVER_PREF_SRING, DEFAULT_USB_DRIVER);
-        config.virtualController_enable = prefs.getBoolean(VIRTUAL_CONTROLLER_ENABLE, VIRTUAL_CONTROLLER_ENABLE_DEFAULT);
+        config.onscreenController = prefs.getBoolean(ONSCREEN_CONTROLLER_PREF_STRING, ONSCREEN_CONTROLLER_DEFAULT);
 
         return config;
     }
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 19610357..b7d348cf 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -51,9 +51,9 @@
             android:summary="@string/summary_checkbox_xb1_driver"
             android:defaultValue="true" />
         <CheckBoxPreference
-            android:key="virtual_controller_checkbox_enable"
-            android:title="Enable virtual onscreen controller"
-            android:summary="Show virtual controller overlay on game screen"
+            android:key="checkbox_onscreen_controller"
+            android:title="On-screen controls"
+            android:summary="Show virtual controller overlay on touchscreen"
             android:defaultValue="true"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_host_settings">