Make VR User Agent the default. Fixes #478 (#704)

MozillaReality · Nov 2, 2018 · 4efd107 · 4efd107
1 parent 7686578
commit 4efd107
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
@@ -7,6 +7,7 @@
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 
+import org.mozilla.geckoview.GeckoSessionSettings;
 import org.mozilla.telemetry.TelemetryHolder;
 import org.mozilla.vrbrowser.R;
 import org.mozilla.vrbrowser.telemetry.TelemetryWrapper;
@@ -37,7 +38,7 @@ SettingsStore getInstance(final @NonNull Context aContext) {
     public final static boolean ENV_OVERRIDE_DEFAULT = false;
     public final static boolean MULTIPROCESS_DEFAULT = false;
     public final static boolean SERVO_DEFAULT = false;
-    public final static int UA_MODE_DEFAULT = 0;
+    public final static int UA_MODE_DEFAULT = GeckoSessionSettings.USER_AGENT_MODE_VR;
     public final static int INPUT_MODE_DEFAULT = 1;
     public final static float DISPLAY_DENSITY_DEFAULT = 1.0f;
     public final static int WINDOW_WIDTH_DEFAULT = 800;
@@ -162,12 +163,12 @@ public void setServoEnabled(boolean isEnabled) {
 
     public int getUaMode() {
         return mPrefs.getInt(
-                mContext.getString(R.string.settings_key_desktop_version), UA_MODE_DEFAULT);
+                mContext.getString(R.string.settings_key_user_agent_version), UA_MODE_DEFAULT);
     }
 
     public void setUaMode(int mode) {
         SharedPreferences.Editor editor = mPrefs.edit();
-        editor.putInt(mContext.getString(R.string.settings_key_desktop_version), mode);
+        editor.putInt(mContext.getString(R.string.settings_key_user_agent_version), mode);
         editor.commit();
     }
 

diff --git a/app/src/main/res/values/non_L10n.xml b/app/src/main/res/values/non_L10n.xml
@@ -10,7 +10,7 @@
     <string name="settings_key_environment_override" translatable="false">settings_environment_override</string>
     <string name="settings_key_multiprocess" translatable="false">settings_environment_multiprocess</string>
     <string name="settings_key_servo">settings_environment_servo</string>
-    <string name="settings_key_desktop_version" translatable="false">settings_desktop_version</string>
+    <string name="settings_key_user_agent_version" translatable="false">settings_user_agent_version</string>
     <string name="settings_key_input_mode" translatable="false">settings_touch_mode</string>
     <string name="settings_key_display_density" translatable="false">settings_display_density</string>
     <string name="settings_key_window_width" translatable="false">settings_window_width</string>