put SDK update in a thread, seems to solve UI freeze, enable BT

debugging when selecting watch face.

Author: codeanticode

src/processing/mode/android/AndroidBuild.java

@@ -52,6 +52,11 @@ class AndroidBuild extends JavaBuild {
 
   //  static final String basePackage = "changethispackage.beforesubmitting.tothemarket";
   static final String basePackage = "processing.test";
+  static public final int min_sdk_fragment = 14; // Ice Cream Sandwich
+  static public final int min_sdk_wallpaper = 14;  
+  static public final int min_sdk_watchface = 21; // Lillipop
+  static public final int min_sdk_cardboard = 19; // Kitkat
+  
   static String sdkName = "5.0";
   static String sdkVersion = "21";  // Android 5.0 (Lollipop)
   static String sdkTarget = "android-" + sdkVersion;

src/processing/mode/android/AndroidEditor.java

@@ -75,6 +75,10 @@ public UpdateDeviceListTask(JMenu deviceMenu) {
     @Override
     public void run() {
       if (androidMode == null || androidMode.getSDK() == null) return;
+      
+      if (AndroidBuild.publishOption == AndroidBuild.WATCHFACE) {
+        Devices.enableBlueToothDebugging();
+      }
 
       final Devices devices = Devices.getInstance();
       java.util.List<Device> deviceList = devices.findMultiple(false);
@@ -144,6 +148,44 @@ public void actionPerformed(ActionEvent e) {
       }
     }
   }
+  
+  
+  class UpdateSDKListTask extends TimerTask {
+    
+    private JMenu sdkMenu;
+
+    public UpdateSDKListTask(JMenu sdkMenu) {
+      this.sdkMenu = sdkMenu;
+    }
+    
+    @Override
+    public void run() {
+      while (androidMode == null || androidMode.getSDK() == null) {
+        try {
+          Thread.sleep(3000);
+        } catch (InterruptedException e) {
+          e.printStackTrace();
+        }
+        updateSdkMenu(sdkMenu);        
+      }
+      
+      /*
+      new Thread() {
+        @Override
+        public void run() {
+          while(androidMode == null || androidMode.getSDK() == null) {
+            try {
+              Thread.sleep(3000);
+            } catch (InterruptedException e) {
+              e.printStackTrace();
+            }
+          }
+          updateSdkMenu(sdkMenu);
+        }
+      }.start();
+      */      
+    }    
+  }
 
 
   public EditorToolbar createToolbar() {
@@ -275,59 +317,35 @@ public void actionPerformed(ActionEvent e) {
     menu.add(watchfaceItem);
 
     menu.addSeparator();
-    
-
-    /*item = new JMenuItem("Signing Key Setup");
-    item.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        new Keys(AndroidEditor.this);
-      }
-    });
-    item.setEnabled(false);
-    menu.add(item); */
 
     final JMenu mobDeveMenu = new JMenu("Devices");
 
     JMenuItem noMobDevItem = new JMenuItem("No connected devices");
     noMobDevItem.setEnabled(false);
     mobDeveMenu.add(noMobDevItem);
     menu.add(mobDeveMenu);
-    
+  
     // start updating device menus
-    UpdateDeviceListTask task = new UpdateDeviceListTask(mobDeveMenu);
-    java.util.Timer timer = new java.util.Timer();
-    timer.schedule(task, 5000, 5000);
-    
-//    final JMenu wearDevMenu = new JMenu("Select wearable device");
-//
-//    JMenuItem noWearDevicesItem = new JMenuItem("No connected devices");
-//    noWearDevicesItem.setEnabled(false);
-//    wearDevMenu.add(noWearDevicesItem);
-//    menu.add(wearDevMenu);    
+    UpdateDeviceListTask devTask = new UpdateDeviceListTask(mobDeveMenu);
+    java.util.Timer devTimer = new java.util.Timer();
+    devTimer.schedule(devTask, 5000, 5000);
 
     menu.addSeparator();
 
     // TODO: The SDK selection menu will be removed once app publishing is fully
-    // functional (correct SDK level can be inferred from app type (fragment, 
-    // wallpaper, etc).
-    final JMenu sdkMenu = new JMenu("Select target SDK");
-    JMenuItem defaultItem = new JCheckBoxMenuItem("No available targets");
-    defaultItem.setEnabled(false);
-    sdkMenu.add(defaultItem);
-
-    new Thread() {
-      @Override
-      public void run() {
-        while(androidMode == null || androidMode.getSDK() == null) {
-          try {
-            Thread.sleep(3000);
-          } catch (InterruptedException e) {
-            e.printStackTrace();
-          }
-        }
-        updateSdkMenu(sdkMenu);
-      }
-    }.start();
+    // functional: correct minimum SDK level can be inferred from app type 
+    // (fragment, wallpaper, etc), and target SDK from the highest available in
+    // the SDK.
+    final JMenu sdkMenu = new JMenu("Target SDK");
+    
+    JMenuItem noAvailSDKItem = new JCheckBoxMenuItem("No available targets");
+    noAvailSDKItem.setEnabled(false);
+    sdkMenu.add(noAvailSDKItem);
+    menu.add(sdkMenu);
+    
+    UpdateSDKListTask sdkTask = new UpdateSDKListTask(sdkMenu);
+    java.util.Timer sdkTimer = new java.util.Timer();
+    sdkTimer.schedule(sdkTask, 500, 5000);
 
     menu.add(sdkMenu);
 
@@ -381,8 +399,8 @@ private void updateSdkMenu(final JMenu sdkMenu) {
       boolean savedTargetSet = false;
 
       for (final AndroidSDK.SDKTarget target : targets) {
-        if (target.version < 11) {
-          //We do not support API level less than 11
+        if (target.version < 19) {
+          //We do not support API level less than 19
           continue;
         }
 

src/processing/mode/android/Devices.java

@@ -26,6 +26,8 @@ class Devices {
 
   private static final Devices INSTANCE = new Devices();
 
+  private static final String BT_DEBUG_PORT = "4444";
+  
   private Device selectedDevice;
 
   public static Devices getInstance() {
@@ -56,6 +58,17 @@ public static void killAdbServer() {
     }
   }
 
+  public static void enableBlueToothDebugging() {
+    try {
+      // Enable debugging over bluetooth
+      // http://developer.android.com/training/wearables/apps/bt-debugging.html
+      AndroidSDK.runADB("forward", "tcp:" + BT_DEBUG_PORT, "localabstract:/adb-hub");
+      AndroidSDK.runADB("connect", "127.0.0.1:" + BT_DEBUG_PORT);
+    } catch (final Exception e) {
+      e.printStackTrace();
+    }    
+  }
+  
 
   private Devices() {
     if (processing.app.Base.DEBUG) {