summaryrefslogtreecommitdiffstats
path: root/samples/TicTacToeLib
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2010-04-06 13:10:57 -0700
committerRaphael <raphael@google.com>2010-04-06 13:10:57 -0700
commit7dd0976b043a8d609346812f67dc7a99175252aa (patch)
tree19abe03a89aec8cce549216ceca2a3a672c5b77b /samples/TicTacToeLib
parentedabb7bfeb67a1c3e3784914f6d2deba0d69b60c (diff)
downloadandroid_development-7dd0976b043a8d609346812f67dc7a99175252aa.tar.gz
android_development-7dd0976b043a8d609346812f67dc7a99175252aa.tar.bz2
android_development-7dd0976b043a8d609346812f67dc7a99175252aa.zip
Project-lib sample: define lib activity.
This was removed by mistake. I meant to add explanations. Change-Id: I3641b7c01a1425ab5430695ac83ca71c9fc644d8
Diffstat (limited to 'samples/TicTacToeLib')
-rwxr-xr-xsamples/TicTacToeLib/AndroidManifest.xml15
1 files changed, 11 insertions, 4 deletions
diff --git a/samples/TicTacToeLib/AndroidManifest.xml b/samples/TicTacToeLib/AndroidManifest.xml
index db44c0566..14df57e69 100755
--- a/samples/TicTacToeLib/AndroidManifest.xml
+++ b/samples/TicTacToeLib/AndroidManifest.xml
@@ -16,7 +16,14 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.android.tictactoe.library"
- android:versionCode="1"
- android:versionName="1.0">
-</manifest> \ No newline at end of file
+ package="com.example.android.tictactoe.library">
+ <application>
+ <!-- The activity tag here is currently not used. The main project TicTacToeMain
+ must currently redefine the activities to be used from the libraries.
+ However later the tools will pick up the activities from here and merge them
+ automatically, so it's best to define your activities here like for any
+ regular Android project.
+ -->
+ <activity android:name="GameActivity" />
+ </application>
+</manifest>