make sure that device is a watch when installing a watch face

Author: codeanticode

src/processing/mode/android/AndroidBuild.java

@@ -31,7 +31,6 @@
 import processing.app.Library;
 import processing.app.Messages;
 import processing.app.Platform;
-import processing.app.Preferences;
 import processing.app.Sketch;
 import processing.app.SketchException;
 import processing.app.Util;
@@ -71,7 +70,7 @@ class AndroidBuild extends JavaBuild {
   static public final String target_api_level   = "22";  
   static public final String target_platform    = "android-" + target_api_level;
 
-  static int appComponent = FRAGMENT;
+  static public int appComponent = FRAGMENT;
   static boolean forceNewManifest = false;
 
   private final AndroidSDK sdk;
@@ -204,11 +203,6 @@ public File createProject() throws IOException, SketchException {
       // object returned by initSketchSize()
       writeMainClass(srcFolder, preproc.getRenderer(sketch.getMainProgram()));
 
-      // new location for SDK Tools 17: /opt/android/tools/proguard/proguard-android.txt
-//      File proguardSrc = new File(sdk.getSdkFolder(), "tools/lib/proguard.cfg");
-//      File proguardDst = new File(tmpFolder, "proguard.cfg");
-//      Base.copyFile(proguardSrc, proguardDst);
-
       final File libsFolder = mkdirs(tmpFolder, "libs");
       final File assetsFolder = mkdirs(tmpFolder, "assets");
 

src/processing/mode/android/AndroidMode.java

@@ -300,7 +300,7 @@ public void handleRunDevice(Sketch sketch, RunnerListener listener)
 
   public void showSelectComponentMessage() {
     if (showBluetoothDebugMessage && AndroidBuild.appComponent == AndroidBuild.WATCHFACE) {
-      Messages.showMessage("Enable bluetooth debugging!",
+      Messages.showMessage("Is Debugging over Bluetooth enabled?",
                            "Processing will access the wearable through the handheld paired to it.\n" +
                            "Make sure to enable \"Debugging over Bluetooth\" for this to work:\n" +
                            "http://developer.android.com/training/wearables/apps/bt-debugging.html");   
@@ -310,7 +310,7 @@ public void showSelectComponentMessage() {
 
   public void showPostBuildMessage() {
     if (showWallpaperSelectMessage && AndroidBuild.appComponent == AndroidBuild.WALLPAPER) {
-      Messages.showMessage("Now select the wallpaper!",
+      Messages.showMessage("Now select the wallpaper...",
                            "Processing built and installed your sketch\n" +
                            "as a live wallpaper on the selected device.\n" +
                            "You need to open the wallpaper selector\n" + 

src/processing/mode/android/AndroidRunner.java

@@ -30,6 +30,7 @@
 import java.util.regex.Pattern;
 
 import processing.app.ui.Editor;
+import processing.app.Messages;
 import processing.app.RunnerListener;
 import processing.app.SketchException;
 import processing.mode.java.runner.Runner;
@@ -76,6 +77,15 @@ public void launch(Future<Device> deviceFuture) {
       Devices.killAdbServer();
       return;
     }
+    
+    if (AndroidBuild.appComponent == AndroidBuild.WATCHFACE && !device.hasFeature("watch")) {
+      Messages.showWarning("Device is not a watch!", 
+                           "Processing built your sketch as a watch face, but\n" +
+                           "you selected a non-watch device to install it on.\n" +
+                           "Please select a watch device instead.");      
+      listener.statusError("Trying to install a watch face on a non-watch device. Select correct device.");
+      return;
+    }
 
     device.addListener(this);
 

src/processing/mode/android/Device.java

@@ -39,6 +39,7 @@
 class Device {
   private final Devices env;
   private final String id;
+  private final String features;
   private final Set<Integer> activeProcesses = new HashSet<Integer>();
   private final Set<DeviceListener> listeners = 
     Collections.synchronizedSet(new HashSet<DeviceListener>());
@@ -52,6 +53,17 @@ class Device {
   public Device(final Devices env, final String id) {
     this.env = env;
     this.id = id;
+    
+    // http://android.stackexchange.com/questions/82169/howto-get-devices-features-with-adb
+    String concat = ""; 
+    try {
+      final ProcessResult res = adb("shell", "getprop", "ro.build.characteristics");
+      for (String line : res) {
+        concat += "," + line.toLowerCase();     
+      }      
+    } catch (final Exception e) {
+    }
+    this.features = concat;
   }
 
   public void bringLauncherToFront() {
@@ -64,6 +76,10 @@ public void bringLauncherToFront() {
     }
   }
 
+  public boolean hasFeature(String feature) {
+    return -1 < features.indexOf(feature);
+  }
+  
   public String getName() {
     String name = "";