Skip to content

Commit 9da4d5e

Browse files
codeanticodecodeanticode
authored
Merge pull request #720 from processing/sdkupdater-improvement-testing
Merging SDKUpdater improvements and latest fixes
2 parents b807ab8 + 85d0c3f commit 9da4d5e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+753
-195
lines changed

‎build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@ task dist {
136136
FileUtils.copyDirectory(file("mode/languages"),
137137
file("${root}/languages"))
138138

139+
FileUtils.copyDirectory(file("mode/resources"),
140+
file("${root}/resources"))
141+
139142
FileUtils.copyDirectory(file("mode/tools/SDKUpdater/tool"),
140143
file("${root}/tools/SDKUpdater/tool"))
141144
FileUtils.copyDirectory(file("mode/tools/SDKUpdater/lib"),

‎mode/.classpath

+8-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,19 @@
66
<attribute name="gradle_used_by_scope" value="main,test"/>
77
</attributes>
88
</classpathentry>
9-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
9+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/">
10+
<attributes>
11+
<attribute name="module" value="true"/>
12+
</attributes>
13+
</classpathentry>
1014
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
1115
<classpathentry combineaccessrules="false" kind="src" path="/processing4-app"/>
1216
<classpathentry combineaccessrules="false" kind="src" path="/processing4-core"/>
1317
<classpathentry combineaccessrules="false" kind="src" path="/processing4-java"/>
1418
<classpathentry kind="var" path="ANDROID_JAR"/>
1519
<classpathentry kind="var" path="ANDROID_SDK"/>
20+
<classpathentry kind="lib" path="mode/gradle-tooling-api-7.2.jar"/>
21+
<classpathentry kind="lib" path="mode/jdi.jar"/>
22+
<classpathentry kind="lib" path="mode/jdimodel.jar"/>
1623
<classpathentry kind="output" path="bin/default"/>
1724
</classpath>

‎mode/.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>mode</name>
3+
<name>android-mode</name>
44
<comment></comment>
55
<projects>
66
</projects>

‎mode/.settings/org.eclipse.buildship.core.prefs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=
2+
eclipse.preferences.version=1

‎mode/.settings/org.eclipse.jdt.core.prefs

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=17
6+
org.eclipse.jdt.core.compiler.compliance=1.8
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1010
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1112
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
12-
org.eclipse.jdt.core.compiler.source=17
13+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
14+
org.eclipse.jdt.core.compiler.release=disabled
15+
org.eclipse.jdt.core.compiler.source=1.8

‎mode/libraries/vr/build.gradle

+14-9
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ plugins {
88
dependencies {
99
compileOnly name: "android"
1010
compileOnly "org.p5android:processing-core:${modeVersion}"
11-
implementationAar "com.google.vr:sdk-audio:${gvrVersion}"
12-
implementationAar "com.google.vr:sdk-base:${gvrVersion}"
11+
12+
// commenting due to issue #718
13+
// implementationAar "com.google.vr:sdk-audio:${gvrVersion}"
14+
// implementationAar "com.google.vr:sdk-base:${gvrVersion}"
15+
16+
// fix for Issue #718
17+
implementationAar fileTree(dir: "libs", include: ["*.aar"])
1318
}
1419

1520
task sourceJar(type: Jar, dependsOn: classes) {
@@ -53,35 +58,35 @@ compileJava.doFirst {
5358
libFolder.mkdirs()
5459
for (String fn : deps) {
5560
Files.copy(file("${rootDir}/build/libs/" + fn).toPath(),
56-
file("library/" + fn).toPath(), REPLACE_EXISTING);
61+
file("library/" + fn).toPath(), REPLACE_EXISTING);
5762
}
5863
}
5964

6065
build.doLast {
6166
// Copying vr jar to library folder
6267
File vrJar = file("library/vr.jar")
6368
vrJar.mkdirs();
64-
69+
6570
// Need to check the existance of the files before using as the files
6671
// will get generated only if Task ':mode:libraries:vr:jar' is not being skipped
6772
// Task ':mode:libraries:vr:jar' will be skipped if source files are unchanged or jar task is UP-TO-DATE
68-
73+
6974
if (file("$buildDir/libs/vr.jar").exists()) {
7075
Files.copy(file("$buildDir/libs/vr.jar").toPath(),
71-
vrJar.toPath(), REPLACE_EXISTING);
76+
vrJar.toPath(), REPLACE_EXISTING);
7277
}
7378
// Renaming artifacts for maven publishing
7479
if (file("$buildDir/libs/vr.jar").exists()) {
7580
Files.move(file("$buildDir/libs/vr.jar").toPath(),
76-
file("$buildDir/libs/processing-vr-${vrLibVersion}.jar").toPath(), REPLACE_EXISTING);
81+
file("$buildDir/libs/processing-vr-${vrLibVersion}.jar").toPath(), REPLACE_EXISTING);
7782
}
7883
if (file("$buildDir/libs/vr-sources.jar").exists()) {
7984
Files.move(file("$buildDir/libs/vr-sources.jar").toPath(),
80-
file("$buildDir/libs/processing-vr-${vrLibVersion}-sources.jar").toPath(), REPLACE_EXISTING);
85+
file("$buildDir/libs/processing-vr-${vrLibVersion}-sources.jar").toPath(), REPLACE_EXISTING);
8186
}
8287
if (file("$buildDir/libs/vr.jar.MD5").exists()) {
8388
Files.move(file("$buildDir/libs/vr.jar.MD5").toPath(),
84-
file("$buildDir/libs/processing-vr-${vrLibVersion}.jar.md5").toPath(), REPLACE_EXISTING);
89+
file("$buildDir/libs/processing-vr-${vrLibVersion}.jar.md5").toPath(), REPLACE_EXISTING);
8590
}
8691
}
8792

‎mode/libraries/vr/libs/sdk-audio-1.180.0.aar

1.21 MB
Binary file not shown.

‎mode/libraries/vr/libs/sdk-base-1.180.0.aar

2.81 MB
Binary file not shown.

‎mode/libraries/vr/libs/sdk-common-1.180.0.aar

507 KB
Binary file not shown.

‎mode/mode.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ url = http://android.processing.org
44
sentence = This mode lets you use Processing to create Android apps
55
paragraph =
66
imports=processing.mode.java.JavaMode
7-
version = 406
8-
prettyVersion = 4.5.0b2
7+
version = 407
8+
prettyVersion = 4.5.0b3
99
minRevision = 1283
1010
maxRevision = 0
1111

‎mode/resources/device-art-resources/device-art.xml

+154
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright (C) 2013 The Android Open Source Project
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<devices>
17+
18+
<device id="pixel_2" name="Pixel 2">
19+
<orientation name="port" size="1370,2534" screenPos="140,280" screenSize="1080,1920" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
20+
<orientation name="land" size="2596,1258" screenPos="338,68" screenSize="1920,1080" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
21+
</device>
22+
23+
<device id="pixel_2_xl" name="Pixel 2 XL">
24+
<orientation name="port" size="1858,3456" screenPos="201,245" screenSize="1440,2880" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
25+
<orientation name="land" size="3477,1754" screenPos="305,108" screenSize="2880,1440" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
26+
</device>
27+
28+
<device id="pixel" name="Pixel">
29+
<orientation name="port" size="1370,2534" screenPos="139,285" screenSize="1080,1920" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
30+
<orientation name="land" size="2596,1258" screenPos="338,78" screenSize="1920,1080" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
31+
</device>
32+
33+
<device id="pixel_silver" name="Pixel Silver">
34+
<orientation name="port" size="1370,2534" screenPos="139,285" screenSize="1080,1920" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
35+
<orientation name="land" size="2596,1258" screenPos="338,78" screenSize="1920,1080" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
36+
</device>
37+
38+
<device id="pixel_xl" name="Pixel XL">
39+
<orientation name="port" size="1840,3297" screenPos="200,325" screenSize="1440,2560" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
40+
<orientation name="land" size="3427,1654" screenPos="393,92" screenSize="2560,1440" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
41+
</device>
42+
43+
<device id="pixel_xl_silver" name="Pixel XL Silver">
44+
<orientation name="port" size="1840,3297" screenPos="200,325" screenSize="1440,2560" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
45+
<orientation name="land" size="3427,1654" screenPos="393,92" screenSize="2560,1440" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
46+
</device>
47+
48+
<device id="pixel_c" name="Pixel C">
49+
<orientation name="port" size="2307,2971" screenPos="259,181" screenSize="1800,2560" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
50+
<orientation name="land" size="3096,2215" screenPos="269,188" screenSize="2560,1800" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
51+
</device>
52+
53+
<device id="nexus_5x" name="Nexus 5X">
54+
<orientation name="port" size="1370,2446" screenPos="147,233" screenSize="1080,1920" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
55+
<orientation name="land" size="2497,1234" screenPos="278,63" screenSize="1920,1080" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
56+
</device>
57+
58+
<device id="nexus_6p" name="Nexus 6P">
59+
<orientation name="port" size="1840,3251" screenPos="195,329" screenSize="1440,2560" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
60+
<orientation name="land" size="3427,1620" screenPos="442,71" screenSize="2560,1440" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
61+
</device>
62+
63+
<device id="watch_square" name="Watch Square">
64+
<orientation name="port" size="474,403" screenPos="100,38" screenSize="280,280" shadow="shadow.png" back="back.png" lights="fore.png" mask="mask.png"/>
65+
<orientation name="land" size="474,403" screenPos="100,38" screenSize="280,280" shadow="shadow.png" back="back.png" lights="fore.png" mask="mask.png"/>
66+
</device>
67+
68+
<device id="watch_round" name="Watch Round">
69+
<orientation name="port" size="370,424" screenPos="25,26" screenSize="320,320" shadow="shadow.png" back="back.png" lights="fore.png" mask="mask.png"/>
70+
<orientation name="land" size="370,424" screenPos="25,26" screenSize="320,320" shadow="shadow.png" back="back.png" lights="fore.png" mask="mask.png"/>
71+
</device>
72+
73+
<device id="tv_1080p" name="Android TV 1080p">
74+
<orientation name="land" size="2090,1255" screenPos="85,59" screenSize="1920,1080" shadow="shadow.png" back="back.png" lights="fore.png"/>
75+
</device>
76+
77+
<device id="tv_4k" name="Android TV 4K">
78+
<orientation name="land" size="4180,2510" screenPos="170,118" screenSize="3840,2160" shadow="shadow.png" back="back.png" lights="fore.png"/>
79+
</device>
80+
81+
<device id="tv_720p" name="Android TV 720p">
82+
<orientation name="land" size="1394,837" screenPos="57,39" screenSize="1280,720" shadow="shadow.png" back="back.png" lights="fore.png"/>
83+
</device>
84+
85+
<device id="nexus_9" name="Nexus 9">
86+
<orientation name="port" size="1978,2631" screenPos="219,264" screenSize="1536,2048" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
87+
<orientation name="land" size="2854,1785" screenPos="401,100" screenSize="2048,1536" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
88+
</device>
89+
90+
<device id="nexus_6" name="Nexus 6">
91+
<orientation name="port" size="1896,3054" screenPos="229,239" screenSize="1440,2560" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
92+
<orientation name="land" size="3142,1639" screenPos="318,76" screenSize="2560,1440" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
93+
</device>
94+
95+
<device id="nexus_5" name="Nexus 5">
96+
<orientation name="port" size="1370,2405" screenPos="144,195" screenSize="1080,1920" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
97+
<orientation name="land" size="2497,1235" screenPos="261,65" screenSize="1920,1080" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
98+
</device>
99+
100+
<device id="nexus_4" name="Nexus 4">
101+
<orientation name="port" size="958,1678" screenPos="94,187" screenSize="768,1280" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
102+
<orientation name="land" size="1799,885" screenPos="257,45" screenSize="1280,768" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
103+
</device>
104+
105+
<device id="nexus_7_2013" name="Nexus 7">
106+
<orientation name="port" size="1596,2571" screenPos="195,301" screenSize="1200,1920" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
107+
<orientation name="land" size="2772,1479" screenPos="423,120" screenSize="1920,1200" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
108+
</device>
109+
110+
<device id="nexus_7" name="Nexus 7 (2012)">
111+
<orientation name="port" size="1094,1689" screenPos="142,190" screenSize="800,1280" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
112+
<orientation name="land" size="1803,1045" screenPos="260,105" screenSize="1280,800" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
113+
</device>
114+
115+
<device id="nexus_10" name="Nexus 10">
116+
<orientation name="port" size="2330,3136" screenPos="366,266" screenSize="1600,2560" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
117+
<orientation name="land" size="3340,2176" screenPos="388,266" screenSize="2560,1600" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
118+
</device>
119+
120+
<device id="xoom" name="Motorola XOOM">
121+
<orientation name="port" size="1170,1471" screenPos="185,83" screenSize="800,1280" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
122+
<orientation name="land" size="1569,998" screenPos="152,89" screenSize="1280,800" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
123+
</device>
124+
125+
<device id="galaxy_nexus" name="Galaxy Nexus">
126+
<orientation name="port" size="1101,1709" screenPos="192,213" screenSize="720,1280" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
127+
<orientation name="land" size="1847,886" screenPos="304,68" screenSize="1280,720" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
128+
</device>
129+
130+
<device id="nexus_s" name="Nexus S">
131+
<orientation name="port" size="719,1139" screenPos="119,160" screenSize="480,800" shadow="port_shadow.webp" back="port_back.webp" lights="port_fore.webp"/>
132+
<orientation name="land" size="1210,586" screenPos="208,44" screenSize="800,480" shadow="land_shadow.webp" back="land_back.webp" lights="land_fore.webp"/>
133+
</device>
134+
135+
<device id="nexus_one" name="Nexus One">
136+
<orientation name="port" size="732,1178" screenPos="125,131" screenSize="480,800" shadow="port_shadow.webp" back="port_back.webp"/>
137+
<orientation name="land" size="1300,612" screenPos="200,52" screenSize="800,480" shadow="land_shadow.webp" back="land_back.webp"/>
138+
</device>
139+
140+
<device id="phone" name="Generic Phone">
141+
<orientation name="port" size="568,256" screenPos="113,93" screenSize="343,46" shadow="phone_shadow_simple_port.9.png" back="phone_back_simple_port.9.png"/>
142+
<orientation name="land" size="607,350" screenPos="141,36" screenSize="324,255" shadow="phone_shadow_simple_land.9.png" back="phone_back_simple_land.9.png"/>
143+
</device>
144+
145+
<device id="tablet" name="Generic Tablet">
146+
<orientation name="port" size="1310,313" screenPos="256,111" screenSize="802,55" shadow="tablet_shadow_simple_port.9.png" back="tablet_back_simple.9.png"/>
147+
<orientation name="land" size="1310,313" screenPos="256,111" screenSize="802,55" shadow="tablet_shadow_simple_land.9.png" back="tablet_back_simple.9.png"/>
148+
</device>
149+
150+
<device id="automotive_1024" name="Automotive">
151+
<orientation name="land" size="1461,1481" screenPos="218,124" screenSize="1024,768" back="back.png" lights="fore.png"/>
152+
</device>
153+
154+
</devices>

‎mode/resources/device-art-resources/pixel_3/layout

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
parts {
2+
device {
3+
display {
4+
width 1080
5+
height 2160
6+
x 0
7+
y 0
8+
}
9+
}
10+
portrait {
11+
background {
12+
image port_back.webp
13+
}
14+
foreground {
15+
mask round_corners.webp
16+
}
17+
onion {
18+
image port_fore.webp
19+
}
20+
}
21+
}
22+
layouts {
23+
portrait {
24+
width 1194
25+
height 2532
26+
event EV_SW:0:1
27+
part1 {
28+
name portrait
29+
x 0
30+
y 0
31+
}
32+
part2 {
33+
name device
34+
x 54
35+
y 196
36+
}
37+
}
38+
}

‎mode/resources/device-art-resources/pixel_3/port_back.webp

1.09 MB
Binary file not shown.

‎mode/resources/device-art-resources/pixel_3/round_corners.webp

1.78 KB
Binary file not shown.

‎mode/resources/device-art-resources/pixel_6/back.webp

185 KB
Binary file not shown.

‎mode/resources/device-art-resources/pixel_6/layout

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
parts {
2+
device {
3+
display {
4+
width 1080
5+
height 2400
6+
x 0
7+
y 0
8+
}
9+
}
10+
portrait {
11+
background {
12+
image back.webp
13+
}
14+
foreground {
15+
mask mask.webp
16+
cutout hole
17+
}
18+
}
19+
}
20+
layouts {
21+
portrait {
22+
width 1209
23+
height 2553
24+
event EV_SW:0:1
25+
part1 {
26+
name portrait
27+
x 0
28+
y 0
29+
}
30+
part2 {
31+
name device
32+
x 60
33+
y 69
34+
}
35+
}
36+
}

‎mode/resources/device-art-resources/pixel_6/mask.webp

6.41 KB
Binary file not shown.

‎mode/resources/device-art-resources/pixel_c/land_back.webp

37.9 KB
Binary file not shown.

‎mode/resources/device-art-resources/pixel_c/land_fore.webp

20.4 KB
Binary file not shown.

‎mode/resources/device-art-resources/pixel_c/land_shadow.webp

16.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)