Skip to content

Commit 00b92d1

Browse files
committed
Finally got the last two projects working
1 parent 32cd164 commit 00b92d1

File tree

6 files changed

+40
-22
lines changed

6 files changed

+40
-22
lines changed

12/FinchVideo/README.txt

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
1-
In order to get this project to build, you must import
2-
the project FinchWelcome, from the directory
1+
This project depend on the project
2+
3+
FinchWelcome
4+
5+
from the directory:
36

47
../framework/FinchFramework
58

6-
into your eclipse workspace
9+
If it does not build, you may need to set up FinchWelcome as a library:
10+
11+
1) import FinchWelcome into your workspace
12+
2) for FinchWelcome, check Properties > Android and verify that it is
13+
a library project (bottom half of the dialog)
14+
3) in the project, use Android > Properties to add that project
15+
to this one, as a library
16+
17+
Using the normal eclipse project dependency mechanism will not work.

12/FinchVideo/default.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@
99

1010
# Project target.
1111
target=Google Inc.:Google APIs:9
12+
android.library.reference.1=../../framework/FinchFramework
13+
android.library=false

12/FinchVideo/tools/ide/eclipse/classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
44
<classpathentry kind="src" path="src"/>
55
<classpathentry kind="src" path="gen"/>
6-
<classpathentry combineaccessrules="false" kind="src" path="/FinchWelcome"/>
6+
<classpathentry kind="src" path="FinchWelcome_lib-src"/>
77
<classpathentry kind="output" path="bin"/>
88
</classpath>

12/FinchVideo/tools/ide/eclipse/project

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,16 @@
3030
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
3131
<nature>org.eclipse.jdt.core.javanature</nature>
3232
</natures>
33+
<linkedResources>
34+
<link>
35+
<name>FinchWelcome_lib-src</name>
36+
<type>2</type>
37+
<locationURI>_android_FinchWelcome_5a987fb2/lib-src</locationURI>
38+
</link>
39+
<link>
40+
<name>FinchWelcome_src</name>
41+
<type>2</type>
42+
<locationURI>_android_FinchWelcome_5a987fb2/src</locationURI>
43+
</link>
44+
</linkedResources>
3345
</projectDescription>

framework/FinchFramework/AndroidManifest.xml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,26 @@
33
package="com.finchframework.finch"
44
android:versionCode="1"
55
android:versionName="1.0">
6-
<application android:icon="@drawable/icon" android:label="@string/app_name"
7-
android:name="FinchApplication" android:debuggable="true">
8-
<provider android:name=".video.FinchVideoContentProvider"
9-
android:authorities=
10-
"com.finchframework.finch.video.FinchVideo"
11-
/>
12-
<activity
13-
android:name=".CheckBoxExample"
14-
android:label="@string/checkbox_app_name"
15-
>
16-
</activity>
6+
<application android:icon="@drawable/icon"
7+
android:label="@string/app_name"
8+
android:debuggable="true">
179
<activity android:name=".FinchWelcome"
1810
android:label="@string/app_name">
1911
<intent-filter>
2012
<action android:name="android.intent.action.MAIN" />
2113
<category android:name="android.intent.category.LAUNCHER" />
2214
</intent-filter>
2315
</activity>
24-
<activity android:name="com.finchframework.bluetooth.BtConsoleActivity">
25-
</activity>
26-
<activity android:name="com.finchframework.bluetooth.DeviceListActivity"
16+
<activity android:name="com.finchframework.bluetooth.BtConsoleActivity" />
17+
<activity android:name="com.finchframework.bluetooth.DeviceListActivity"
2718
android:label="@string/select_device"
2819
android:configChanges="orientation|keyboardHidden"/>
29-
<activity android:name="animate.AnimateActivity"></activity>
30-
</application>
20+
<activity android:name="animate.AnimateActivity"></activity>
21+
</application>
22+
3123
<uses-permission android:name="android.permission.INTERNET" />
3224
<uses-permission android:name="android.permission.BLUETOOTH" />
3325
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
34-
26+
3527
<uses-sdk android:minSdkVersion="7" />
3628
</manifest>

framework/FinchFramework/default.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
# project structure.
99

1010
# Project target.
11-
target=Google Inc.:Google APIs:9
11+
target=android-9
12+
android.library=false

0 commit comments

Comments
 (0)