Skip to content

Commit a48ef7c

Browse files
committed
Merge branch 'insertview'
2 parents 3e0b314 + 4effee3 commit a48ef7c

20 files changed

Lines changed: 800 additions & 70 deletions

TUIOService/.classpath

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="lib" path="stub/classes"/>
43
<classpathentry excluding="android/view/" kind="src" path="src"/>
54
<classpathentry kind="src" path="gen"/>
65
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
76
<classpathentry kind="lib" path="assets/processing-core.jar"/>
8-
<classpathentry kind="output" path="bin"/>
7+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
8+
<classpathentry kind="output" path="bin/classes"/>
99
</classpath>

TUIOService/AndroidManifest.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.sigmusic.tacchi.tuio"
44
android:versionCode="1"
5-
android:versionName="1.0"
6-
>
7-
<!-- android:sharedUserId="android.uid.system" -->
5+
android:versionName="1.0">
6+
<!-- android:sharedUserId="android.uid.system"> -->
87

98

109

1110

1211

13-
<uses-sdk android:minSdkVersion="8" />
12+
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14" />
1413

1514
<application android:icon="@drawable/icon" android:label="@string/app_name" android:persistent="true">
1615
<activity android:name=".TuioTest"
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
50 Bytes
Binary file not shown.
261 Bytes
Binary file not shown.
Binary file not shown.
2.19 KB
Binary file not shown.

TUIOService/default.properties

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,2 @@
1-
# This file is automatically generated by Android Tools.
2-
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
3-
#
4-
# This file must be checked in Version Control Systems.
5-
#
6-
# To customize properties used by the Ant build system use,
7-
# "build.properties", and override values to adapt the script to your
8-
# project structure.
9-
101
# Project target.
11-
target=android-8
2+
target=android-14

TUIOService/gen/com/sigmusic/tacchi/tuio/R.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@ public static final class drawable {
1414
public static final int icon=0x7f020000;
1515
}
1616
public static final class id {
17-
public static final int mainview=0x7f050000;
17+
public static final int mainview=0x7f060000;
1818
}
1919
public static final class layout {
2020
public static final int main=0x7f030000;
2121
}
2222
public static final class string {
23-
public static final int app_name=0x7f040001;
24-
public static final int hello=0x7f040000;
23+
public static final int app_name=0x7f050001;
24+
public static final int hello=0x7f050000;
25+
}
26+
public static final class xml {
27+
public static final int tuioservicesettings=0x7f040000;
2528
}
2629
}

0 commit comments

Comments
 (0)