support cardboard/daydream component

Author: codeanticode

mode/src/processing/mode/android/AndroidBuild.java

@@ -49,9 +49,9 @@ class AndroidBuild extends JavaBuild {
   static public final int APP          = 0;
   static public final int WALLPAPER    = 1;
   static public final int WATCHFACE    = 2;
-  static public final int VR           = 3;
-  static public final int VR_CARDBOARD = 4;
-  static public final int VR_DAYDREAM  = 5;
+  static public final int VR_CARDBOARD = 3;
+  static public final int VR_DAYDREAM  = 4;
+  static public final int AR           = 5;
 
   // Minimum SDK's API levels required for each component:
   static public final String MIN_SDK_APP       = "17"; // Android 4.2

mode/src/processing/mode/android/AndroidEditor.java

@@ -321,9 +321,9 @@ private void setAppComponent(int comp) {
       } else if (appComponent == AndroidBuild.WATCHFACE) {
         settings.set("component", "watchface");
       } else if (appComponent == AndroidBuild.VR_CARDBOARD) {
-        settings.set("component", "vr_c");
+        settings.set("component", "cardboard");
       } else if (appComponent == AndroidBuild.VR_DAYDREAM) {
-        settings.set("component", "vr_d");
+        settings.set("component", "daydream");
       } else if (appComponent == AndroidBuild.AR) {
         settings.set("component", "ar");
       }
@@ -591,10 +591,10 @@ private void loadModeSettings() {
       } else if (component.equals("watchface")) {
         appComponent = AndroidBuild.WATCHFACE;
         watchfaceItem.setState(true);
-      } else if (component.equals("vr_c")) {
+      } else if (component.equals("cardboard") || component.equals("vr")) {
         appComponent = AndroidBuild.VR_CARDBOARD;
         cardBoardItem.setState(true);
-      } else if (component.equals("vr_d")) {
+      } else if (component.equals("daydream")) {
         appComponent = AndroidBuild.VR_DAYDREAM;
         dayDreamItem.setState(true);
       } else if (component.equals("ar")) {

mode/src/processing/mode/android/Commander.java

@@ -56,6 +56,8 @@ public class Commander implements RunnerListener {
   static final String targetArg_WALLPAPER = "wallpaper";
   static final String targetArg_WATCHFACE = "watchface";
   static final String targetArg_VR = "vr";
+  static final String targetArg_CARDBOARD = "cardboard";
+  static final String targetArg_DAYDREAM = "daydream";  
   static final String targetArg_AR = "ar";
   static final String sketchArg = "--sketch=";
   static final String forceArg = "--force";
@@ -134,8 +136,10 @@ private void parseArgs(String[] args) {
           appComponent = AndroidBuild.WALLPAPER;
         } else if (compStr.equals(targetArg_WATCHFACE)) {
           appComponent = AndroidBuild.WATCHFACE;
-        } else if (compStr.equals(targetArg_VR)) {
-          appComponent = AndroidBuild.VR;
+        } else if (compStr.equals(targetArg_VR) || compStr.equals(targetArg_CARDBOARD)) {
+          appComponent = AndroidBuild.VR_CARDBOARD;
+        } else if (compStr.equals(targetArg_DAYDREAM)) {
+          appComponent = AndroidBuild.VR_DAYDREAM;
         } else if (compStr.equals(targetArg_AR)) {
           appComponent = AndroidBuild.AR;
         }

mode/src/processing/mode/android/Manifest.java

@@ -56,7 +56,6 @@ public class Manifest {
     "WatchFaceManifest.xml.tmpl",
     "VRManifest.xml.tmpl",
     "VRManifest.xml.tmpl",
-    "VRManifest.xml.tmpl",
     "ARManifest.xml.tmpl"
   };