Skip to content

Commit e7b2b42

Browse files
committed
messages for wallpapers, bluetooth debugging, and missing devices
1 parent 0fe7f50 commit e7b2b42

File tree

2 files changed

+44
-14
lines changed

2 files changed

+44
-14
lines changed

src/processing/mode/android/AndroidEditor.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ public void actionPerformed(ActionEvent e) {
233233
wallpaperItem.setState(false);
234234
watchfaceItem.setSelected(false);
235235
cardboardItem.setSelected(false);
236+
androidMode.showSelectComponentMessage();
236237
}
237238
});
238239
wallpaperItem.addActionListener(new ActionListener() {
@@ -243,6 +244,7 @@ public void actionPerformed(ActionEvent e) {
243244
wallpaperItem.setState(true);
244245
watchfaceItem.setSelected(false);
245246
cardboardItem.setSelected(false);
247+
androidMode.showSelectComponentMessage();
246248
}
247249
});
248250
watchfaceItem.addActionListener(new ActionListener() {
@@ -253,6 +255,7 @@ public void actionPerformed(ActionEvent e) {
253255
wallpaperItem.setState(false);
254256
watchfaceItem.setSelected(true);
255257
cardboardItem.setSelected(false);
258+
androidMode.showSelectComponentMessage();
256259
}
257260
});
258261
cardboardItem.addActionListener(new ActionListener() {
@@ -263,6 +266,7 @@ public void actionPerformed(ActionEvent e) {
263266
wallpaperItem.setState(false);
264267
watchfaceItem.setSelected(false);
265268
cardboardItem.setSelected(true);
269+
androidMode.showSelectComponentMessage();
266270
}
267271
});
268272

src/processing/mode/android/AndroidMode.java

Lines changed: 40 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ public class AndroidMode extends JavaMode {
5353
private File coreZipLocation;
5454
private AndroidRunner runner;
5555

56+
private boolean showBluetoothDebugMessage = true;
57+
private boolean showWallpaperSelectMessage = true;
58+
5659
private boolean checkingSDK = false;
5760
private boolean userCancelledSDKSearch = false;
5861

@@ -268,19 +271,19 @@ public void handleRunEmulator(Sketch sketch, RunnerListener listener) throws Ske
268271

269272
public void handleRunDevice(Sketch sketch, RunnerListener listener)
270273
throws SketchException, IOException {
271-
// JavaBuild build = new JavaBuild(sketch);
272-
// String appletClassName = build.build();
273-
// if (appletClassName != null) {
274-
// runtime = new Runner(build, listener);
275-
// runtime.launch(true);
276-
// }
277-
278-
// try {
279-
// runSketchOnDevice(Environment.getInstance().getHardware(), "debug", this);
280-
// } catch (final MonitorCanceled ok) {
281-
// sketchStopped();
282-
// statusNotice("Canceled.");
283-
// }
274+
275+
final Devices devices = Devices.getInstance();
276+
java.util.List<Device> deviceList = devices.findMultiple(false);
277+
if (deviceList.size() == 0) {
278+
Messages.showWarning("No devices found!",
279+
"Processing did not find any device where to run\n" +
280+
"your sketch on. Make sure that your handheld or\n" +
281+
"wearable is properly connected to the computer\n" +
282+
"and that USB or Bluetooth debugging is enabled.");
283+
listener.statusHalt();
284+
return;
285+
}
286+
284287
listener.startIndeterminate();
285288
listener.statusNotice("Starting build...");
286289
AndroidBuild build = new AndroidBuild(sketch, this);
@@ -291,9 +294,32 @@ public void handleRunDevice(Sketch sketch, RunnerListener listener)
291294
listener.statusNotice("Running sketch on device...");
292295
runner = new AndroidRunner(build, listener);
293296
runner.launch(Devices.getInstance().getHardware());
297+
298+
showPostBuildMessage();
294299
}
295300

296-
301+
public void showSelectComponentMessage() {
302+
if (showBluetoothDebugMessage && AndroidBuild.appComponent == AndroidBuild.WATCHFACE) {
303+
Messages.showMessage("Enable bluetooth debugging!",
304+
"Processing will access the wearable through the handheld paired to it.\n" +
305+
"Make sure to enable \"Debugging over Bluetooth\" for this to work:\n" +
306+
"http://developer.android.com/training/wearables/apps/bt-debugging.html");
307+
showBluetoothDebugMessage = false;
308+
}
309+
}
310+
311+
public void showPostBuildMessage() {
312+
if (showWallpaperSelectMessage && AndroidBuild.appComponent == AndroidBuild.WALLPAPER) {
313+
Messages.showMessage("Now select the wallpaper!",
314+
"Processing built and installed your sketch\n" +
315+
"as a live wallpaper on the selected device.\n" +
316+
"You need to open the wallpaper selector\n" +
317+
"in order to set it as the new background.");
318+
showWallpaperSelectMessage = false;
319+
}
320+
}
321+
322+
297323
public void handleStop(RunnerListener listener) {
298324
listener.statusNotice("");
299325
listener.stopIndeterminate();

0 commit comments

Comments
 (0)