Show device info in device selector window

Author: imilka

src/processing/mode/android/Device.java

@@ -1,14 +1,5 @@
 package processing.mode.android;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import processing.app.Base;
 import processing.app.RunnerListener;
 import processing.app.exec.LineProcessor;
@@ -18,6 +9,11 @@
 import processing.core.PApplet;
 import processing.mode.android.LogEntry.Severity;
 
+import java.io.IOException;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 
 class Device {
   private final Devices env;
@@ -47,6 +43,28 @@ public void bringLauncherToFront() {
     }
   }
 
+  public String getName() {
+    String name = "";
+
+    try {
+      ProcessResult result = AndroidSDK.runADB("-s", id, "shell", "getprop", "ro.product.brand");
+      if(result.succeeded()) {
+        name += result.getStdout() + " ";
+      }
+
+      result = AndroidSDK.runADB("-s", id, "shell", "getprop", "ro.product.model");
+      if(result.succeeded()) {
+        name += result.getStdout();
+      }
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+
+    return name + " [" + id + "]";
+  }
+
   // adb -s emulator-5556 install helloWorld.apk
 
   // : adb -s HT91MLC00031 install bin/Brightness-debug.apk

src/processing/mode/android/DeviceSelector.java

@@ -20,15 +20,19 @@ public DeviceSelector() {
   }
 
   private void refreshList() {
-    Devices devices = Devices.getInstance();
-    java.util.List<Device> deviceList = devices.findMultiple(false);
+    new Thread() {
+      public void run() {
+        Devices devices = Devices.getInstance();
+        java.util.List<Device> deviceList = devices.findMultiple(false);
 
-    String[] data = new String[deviceList.size()];
-    for(int i = 0; i < deviceList.size(); i++) {
-      data[i] = deviceList.get(0).toString();
-    }
+        String[] data = new String[deviceList.size()];
+        for(int i = 0; i < deviceList.size(); i++) {
+          data[i] = deviceList.get(0).getName();
+        }
 
-    list.setListData(data);
+        list.setListData(data);
+      }
+    }.start();
   }
 
   private void createLayout() {